diff --git a/hammond-gtk/resources/gtk/headerbar.ui b/hammond-gtk/resources/gtk/headerbar.ui
index 9eec825..0801116 100644
--- a/hammond-gtk/resources/gtk/headerbar.ui
+++ b/hammond-gtk/resources/gtk/headerbar.ui
@@ -2,12 +2,12 @@
 <!-- Generated with glade 3.20.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <object class="GtkPopover" id="add-popover">
+  <object class="GtkPopover" id="add_popover">
     <property name="can_focus">False</property>
     <property name="tooltip_text" translatable="yes">Add a new feed</property>
     <property name="valign">center</property>
     <child>
-      <object class="GtkBox" id="add-box">
+      <object class="GtkBox" id="add_box">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="valign">center</property>
@@ -18,7 +18,7 @@
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
-          <object class="GtkLabel" id="add-box-enter-address-label">
+          <object class="GtkLabel" id="enter_address_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
@@ -35,12 +35,12 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="add-entry-box">
+          <object class="GtkBox" id="add_entry_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkEntry" id="new-url">
+              <object class="GtkEntry" id="new_url">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="width_chars">30</property>
@@ -53,12 +53,12 @@
               </packing>
             </child>
             <child>
-              <object class="GtkStack" id="add-button-stack">
+              <object class="GtkStack" id="add_button_stack">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="interpolate_size">True</property>
                 <child>
-                  <object class="GtkButton" id="add-button">
+                  <object class="GtkButton" id="add_button">
                     <property name="label" translatable="yes">Add</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -99,7 +99,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="add-box-already-subscribed-label">
+          <object class="GtkLabel" id="already_subscribed_label">
             <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="label" translatable="yes">You are already subscribed to that feed!</property>
@@ -117,7 +117,7 @@
     <property name="can_focus">False</property>
     <property name="show_close_button">True</property>
     <child>
-      <object class="GtkMenuButton" id="add_toggle_button">
+      <object class="GtkMenuButton" id="add_toggle">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -195,18 +195,23 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuButton" id="menu">
+      <object class="GtkMenuButton" id="menu_toggle">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="receives_default">False</property>
+        <property name="tooltip_text" translatable="yes">Add a new feed</property>
         <property name="valign">center</property>
         <child>
           <object class="GtkImage">
             <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>
+        <style>
+          <class name="image-button"/>
+        </style>
       </object>
       <packing>
         <property name="pack_type">end</property>
@@ -214,4 +219,102 @@
       </packing>
     </child>
   </object>
+  <object class="GtkPopoverMenu" id="menu_popover">
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">10</property>
+        <property name="margin_right">10</property>
+        <property name="margin_top">10</property>
+        <property name="margin_bottom">10</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">False</property>
+            <property name="receives_default">False</property>
+            <property name="text" translatable="yes">Preferences</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton" id="refresh_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="text" translatable="yes">Check for new episodes</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSeparator">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">False</property>
+            <property name="receives_default">False</property>
+            <property name="text" translatable="yes">About</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">6</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">False</property>
+            <property name="receives_default">False</property>
+            <property name="text" translatable="yes">Help</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">7</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">False</property>
+            <property name="receives_default">False</property>
+            <property name="text" translatable="yes">Keyboard Shortcuts</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">8</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="submenu">submenu0</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
 </interface>
diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs
index 9d62773..96a3ecc 100644
--- a/hammond-gtk/src/headerbar.rs
+++ b/hammond-gtk/src/headerbar.rs
@@ -13,6 +13,7 @@ use content::Content;
 pub struct Header {
     pub container: gtk::HeaderBar,
     add_toggle: gtk::MenuButton,
+    menu_toggle: gtk::MenuButton,
     switch: gtk::StackSwitcher,
     back_button: gtk::Button,
     show_title: gtk::Label,
@@ -23,7 +24,8 @@ impl Default for Header {
         let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui");
 
         let header: gtk::HeaderBar = builder.get_object("headerbar").unwrap();
-        let add_toggle: gtk::MenuButton = builder.get_object("add_toggle_button").unwrap();
+        let add_toggle: gtk::MenuButton = builder.get_object("add_toggle").unwrap();
+        let menu_toggle: gtk::MenuButton = builder.get_object("menu_toggle").unwrap();
         let switch: gtk::StackSwitcher = builder.get_object("switch").unwrap();
         let back_button: gtk::Button = builder.get_object("back_button").unwrap();
         let show_title: gtk::Label = builder.get_object("show_title").unwrap();
@@ -34,6 +36,7 @@ impl Default for Header {
         Header {
             container: header,
             add_toggle,
+            menu_toggle,
             switch,
             back_button,
             show_title,
@@ -52,9 +55,11 @@ impl Header {
     pub fn init(&self, content: Rc<Content>) {
         let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui");
 
-        let add_popover: gtk::Popover = builder.get_object("add-popover").unwrap();
-        let new_url: gtk::Entry = builder.get_object("new-url").unwrap();
-        let add_button: gtk::Button = builder.get_object("add-button").unwrap();
+        let add_popover: gtk::Popover = builder.get_object("add_popover").unwrap();
+        let menu_popover: gtk::PopoverMenu = builder.get_object("menu_popover").unwrap();
+        let new_url: gtk::Entry = builder.get_object("new_url").unwrap();
+        let add_button: gtk::Button = builder.get_object("add_button").unwrap();
+        let refresh_button: gtk::Button = builder.get_object("refresh_button").unwrap();
         self.switch.set_stack(&content.stack);
 
         new_url.connect_changed(move |url| {
@@ -68,7 +73,13 @@ impl Header {
             // TODO: map the spinner
             add_popover.hide();
         }));
+
+        refresh_button.connect_clicked(clone!(content => move |_| {
+            utils::refresh_feed(content.clone(), None);
+        }));
+
         self.add_toggle.set_popover(&add_popover);
+        self.menu_toggle.set_popover(&menu_popover);
 
         let switch = &self.switch;
         let add_toggle = &self.add_toggle;