diff --git a/src/gui-window.c b/src/gui-window.c
index 4f3f36ced66bd916ebcb247fa9096cd70fd4f707..fd109e56b4ba269a1d215830ede861367c07156e 100644
--- a/src/gui-window.c
+++ b/src/gui-window.c
@@ -39,7 +39,8 @@ struct _GuiWindow
   HdyLeaflet *header_box;
   HdyLeaflet *content_box;
   GtkButton *back;
-  GtkMenuButton *menu;
+  GtkMenuButton *primary_menu;
+  GtkMenuButton *secondary_menu;
   //GtkToggleButton *search_button;
   GtkStackSidebar *sidebar;
   GtkStack *stack;
@@ -220,6 +221,9 @@ update_courses (GuiWindow *self)
                           self->courses[i].name);
   }
 
+  // make the secondary menu visible
+  gtk_widget_show (GTK_WIDGET (self->secondary_menu));
+
   // ellipsize the labels, this is a workaround.
   // See https://source.puri.sm/Librem5/libhandy/issues/118 for the bug report
   // and https://gitlab.gnugen.ch/afontain/moodle/issues/20
@@ -305,7 +309,8 @@ gui_window_class_init (GuiWindowClass *class)
   gtk_widget_class_bind_template_child (widget_class, GuiWindow, header_box);
   gtk_widget_class_bind_template_child (widget_class, GuiWindow, content_box);
   gtk_widget_class_bind_template_child (widget_class, GuiWindow, back);
-  gtk_widget_class_bind_template_child (widget_class, GuiWindow, menu);
+  gtk_widget_class_bind_template_child (widget_class, GuiWindow, primary_menu);
+  gtk_widget_class_bind_template_child (widget_class, GuiWindow, secondary_menu);
   //gtk_widget_class_bind_template_child (widget_class, GuiWindow, search_button);
   gtk_widget_class_bind_template_child (widget_class, GuiWindow, sidebar);
   gtk_widget_class_bind_template_child (widget_class, GuiWindow, stack);
diff --git a/ui/gui-window.ui b/ui/gui-window.ui
index 2af380134492523a398f6412bbed2450138d38dd..b7b270b2375299b130a50c66a78b21da21f391bd 100644
--- a/ui/gui-window.ui
+++ b/ui/gui-window.ui
@@ -3,7 +3,7 @@
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <requires lib="libhandy" version="0.0"/>
-  <object class="GtkPopoverMenu" id="menu_popover">
+  <object class="GtkPopoverMenu" id="primary_menu_popover">
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
@@ -67,6 +67,25 @@
                 <property name="can_focus">False</property>
                 <property name="title">Moody</property>
                 <property name="show_close_button">True</property>
+                <child>
+                  <object class="GtkMenuButton" id="primary_menu">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="popover">primary_menu_popover</property>
+                    <child>
+                      <object class="GtkImage" id="open_primary_menu">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">open-menu-symbolic</property>
+                        <property name="icon_size">1</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="pack_type">end</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="name">sidebar</property>
@@ -112,16 +131,16 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkMenuButton" id="menu">
-                    <property name="visible">True</property>
+                  <object class="GtkMenuButton" id="secondary_menu">
+                    <property name="visible">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="popover">menu_popover</property>
+                    <!--<property name="popover">secondary_menu_popover</property>-->
                     <child>
-                      <object class="GtkImage" id="open_menu">
+                      <object class="GtkImage" id="open_secondary_menu">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="icon_name">open-menu-symbolic</property>
+                        <property name="icon_name">view-more-symbolic</property>
                         <property name="icon_size">1</property>
                       </object>
                     </child>
@@ -217,7 +236,7 @@
                             <property name="opacity">0.7</property>
                             <property name="halign">center</property>
                             <property name="margin_bottom">12</property>
-                            <property name="label" translatable="yes">Hey, Welcome!</property>
+                            <property name="label" translatable="yes">Welcome!</property>
                             <property name="justify">center</property>
                             <property name="wrap">True</property>
                             <attributes>
@@ -236,7 +255,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="opacity">0.7</property>
-                            <property name="label" translatable="yes">This is a very αλφα version.</property>
+                            <property name="label" translatable="yes">You should set you username to use Moody :-)</property>
                             <property name="justify">center</property>
                             <property name="wrap">True</property>
                             <property name="use_markup">True</property>
@@ -335,3 +354,5 @@
 
 
 
+
+