diff --git a/data/key-mapper.glade b/data/key-mapper.glade
index 5396c761..8f80c158 100644
--- a/data/key-mapper.glade
+++ b/data/key-mapper.glade
@@ -135,11 +135,6 @@
     <property name="can-focus">False</property>
     <property name="icon-name">gtk-delete</property>
   </object>
-  <object class="GtkImage" id="gtk-redo-icon">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="stock">gtk-redo</property>
-  </object>
   <object class="GtkDialog" id="unsaved_changes">
     <property name="can-focus">False</property>
     <property name="title" translatable="yes">Key Mapper</property>
@@ -181,7 +176,6 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">True</property>
-                <property name="image">gtk-redo-icon</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -249,7 +243,7 @@
       <action-widget response="-6">go_ahead</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="gtk-redo-icon-2">
+  <object class="GtkImage" id="gtk-redo-icon">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
     <property name="stock">gtk-redo</property>
@@ -276,25 +270,23 @@
     <property name="title" translatable="yes">Key Mapper</property>
     <property name="icon">key-mapper.svg</property>
     <signal name="delete-event" handler="on_close" swapped="no"/>
+    <signal name="key-press-event" handler="key_press" swapped="no"/>
+    <signal name="key-release-event" handler="key_release" swapped="no"/>
     <child>
       <object class="GtkBox" id="vertical-wrapper">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkBox" id="devices">
+          <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="border-width">20</property>
-            <property name="spacing">10</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkLabel">
-                <property name="width-request">50</property>
+              <object class="GtkMenuBar">
+                <property name="height-request">20</property>
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes">Device</property>
-                <property name="width-chars">13</property>
-                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -303,35 +295,69 @@
               </packing>
             </child>
             <child>
-              <object class="GtkComboBoxText" id="device_selection">
+              <object class="GtkBox" id="devices">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <signal name="changed" handler="on_select_device" swapped="no"/>
+                <property name="margin-start">20</property>
+                <property name="margin-end">20</property>
+                <property name="margin-bottom">20</property>
+                <property name="border-width">0</property>
+                <property name="spacing">10</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="width-request">50</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">Device</property>
+                    <property name="width-chars">13</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="device_selection">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <signal name="changed" handler="on_select_device" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="apply_system_layout">
+                    <property name="label" translatable="yes">Restore Defaults</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <property name="tooltip-text" translatable="yes">To give your keys back their original mapping.</property>
+                    <property name="halign">end</property>
+                    <property name="image">gtk-redo-icon</property>
+                    <property name="always-show-image">True</property>
+                    <signal name="clicked" handler="on_apply_system_layout_clicked" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">True</property>
+                <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkButton" id="apply_system_layout">
-                <property name="label" translatable="yes">Apply Defaults</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="tooltip-text" translatable="yes">To give your keys back their original mapping.</property>
-                <property name="halign">end</property>
-                <property name="image">gtk-redo-icon-2</property>
-                <property name="always-show-image">True</property>
-                <signal name="clicked" handler="on_apply_system_layout_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
+            <style>
+              <class name="primary-toolbar"/>
+            </style>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -339,17 +365,6 @@
             <property name="position">0</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">1</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkBox" id="horizontal-wrapper">
             <property name="visible">True</property>
diff --git a/readme/screenshot.png b/readme/screenshot.png
index 0b5b72e3..ece82c77 100644
Binary files a/readme/screenshot.png and b/readme/screenshot.png differ
diff --git a/readme/screenshot_2.png b/readme/screenshot_2.png
index c36da783..c0c0d944 100644
Binary files a/readme/screenshot_2.png and b/readme/screenshot_2.png differ