diff --git a/src/forms/MainWindow.ui b/src/forms/MainWindow.ui
index 3f1888d..eb68e7a 100644
--- a/src/forms/MainWindow.ui
+++ b/src/forms/MainWindow.ui
@@ -117,31 +117,66 @@
      <x>0</x>
      <y>0</y>
      <width>724</width>
-     <height>27</height>
+     <height>21</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuHilfe" >
+   <widget class="QMenu" name="menuAnsicht" >
     <property name="title" >
-     <string>Help</string>
+     <string>&amp;View</string>
     </property>
-    <addaction name="HelpHandbookAction" />
+    <widget class="QMenu" name="menuSpalten" >
+     <property name="title" >
+      <string>Columns</string>
+     </property>
+     <addaction name="ViewColumnsTitleAction" />
+     <addaction name="ViewColumnsUsernameAction" />
+     <addaction name="ViewColumnsUrlAction" />
+     <addaction name="ViewColumnsPasswordAction" />
+     <addaction name="ViewColumnsCommentAction" />
+     <addaction name="separator" />
+     <addaction name="ViewColumnsExpireAction" />
+     <addaction name="ViewColumnsCreationAction" />
+     <addaction name="ViewColumnsLastChangeAction" />
+     <addaction name="ViewColumnsLastAccessAction" />
+     <addaction name="ViewColumnsAttachmentAction" />
+    </widget>
+    <widget class="QMenu" name="menuType_Here" >
+     <property name="title" >
+      <string>Type Here</string>
+     </property>
+    </widget>
+    <widget class="QMenu" name="menuTool_Button_Sizes" >
+     <property name="title" >
+      <string>Toolbar Icon Size</string>
+     </property>
+     <addaction name="ViewToolButtonSize16Action" />
+     <addaction name="ViewToolButtonSize22Action" />
+     <addaction name="ViewToolButtonSize28Action" />
+    </widget>
+    <addaction name="ViewShowToolbarAction" />
+    <addaction name="ViewShowEntryDetailsAction" />
+    <addaction name="ViewShowStatusbarAction" />
     <addaction name="separator" />
-    <addaction name="HelpAboutAction" />
+    <addaction name="ViewHideUsernamesAction" />
+    <addaction name="ViewHidePasswordsAction" />
+    <addaction name="separator" />
+    <addaction name="menuSpalten" />
+    <addaction name="menuTool_Button_Sizes" />
    </widget>
    <widget class="QMenu" name="menuDatei" >
     <property name="title" >
-     <string>File</string>
+     <string>&amp;File</string>
     </property>
     <widget class="QMenu" name="menuImportieren_aus" >
      <property name="title" >
-      <string>Import from...</string>
+      <string>&amp;Import from...</string>
      </property>
      <addaction name="FileImpPwmAction" />
      <addaction name="FileImpKWalletXmlAction" />
     </widget>
     <widget class="QMenu" name="menuExport_to" >
      <property name="title" >
-      <string>Export to...</string>
+      <string>&amp;Export to...</string>
      </property>
      <addaction name="FileExpPlainTextAction" />
     </widget>
@@ -160,15 +195,9 @@
     <addaction name="separator" />
     <addaction name="FileExitAction" />
    </widget>
-   <widget class="QMenu" name="menuExtras" >
-    <property name="title" >
-     <string>Extras</string>
-    </property>
-    <addaction name="ExtrasSettingsAction" />
-   </widget>
    <widget class="QMenu" name="menuBearbeiten" >
     <property name="title" >
-     <string>Edit</string>
+     <string>&amp;Edit</string>
     </property>
     <addaction name="EditNewGroupAction" />
     <addaction name="EditEditGroupAction" />
@@ -188,48 +217,19 @@
     <addaction name="EditSearchAction" />
     <addaction name="EditGroupSearchAction" />
    </widget>
-   <widget class="QMenu" name="menuAnsicht" >
+   <widget class="QMenu" name="menuExtras" >
     <property name="title" >
-     <string>View</string>
+     <string>E&amp;xtras</string>
     </property>
-    <widget class="QMenu" name="menuSpalten" >
-     <property name="title" >
-      <string>Columns</string>
-     </property>
-     <addaction name="ViewColumnsTitleAction" />
-     <addaction name="ViewColumnsUsernameAction" />
-     <addaction name="ViewColumnsUrlAction" />
-     <addaction name="ViewColumnsPasswordAction" />
-     <addaction name="ViewColumnsCommentAction" />
-     <addaction name="separator" />
-     <addaction name="ViewColumnsExpireAction" />
-     <addaction name="ViewColumnsCreationAction" />
-     <addaction name="ViewColumnsLastChangeAction" />
-     <addaction name="ViewColumnsLastAccessAction" />
-     <addaction name="ViewColumnsAttachmentAction" />
-    </widget>
-    <widget class="QMenu" name="menuType_Here" >
-     <property name="title" >
-      <string>Type Here</string>
-     </property>
-    </widget>
-    <widget class="QMenu" name="menuTool_Button_Sizes" >
-     <property name="title" >
-      <string>Toolbar Icon Size</string>
-     </property>
-     <addaction name="ViewToolButtonSize16Action" />
-     <addaction name="ViewToolButtonSize22Action" />
-     <addaction name="ViewToolButtonSize28Action" />
-    </widget>
-    <addaction name="ViewShowToolbarAction" />
-    <addaction name="ViewShowEntryDetailsAction" />
-    <addaction name="ViewShowStatusbarAction" />
-    <addaction name="separator" />
-    <addaction name="ViewHideUsernamesAction" />
-    <addaction name="ViewHidePasswordsAction" />
+    <addaction name="ExtrasSettingsAction" />
+   </widget>
+   <widget class="QMenu" name="menuHilfe" >
+    <property name="title" >
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="HelpHandbookAction" />
     <addaction name="separator" />
-    <addaction name="menuSpalten" />
-    <addaction name="menuTool_Button_Sizes" />
+    <addaction name="HelpAboutAction" />
    </widget>
    <addaction name="menuDatei" />
    <addaction name="menuBearbeiten" />
@@ -239,42 +239,42 @@
   </widget>
   <action name="FileNewAction" >
    <property name="text" >
-    <string>New Database...</string>
+    <string>&amp;New Database...</string>
    </property>
   </action>
   <action name="FileOpenAction" >
    <property name="text" >
-    <string>Open Database...</string>
+    <string>&amp;Open Database...</string>
    </property>
   </action>
   <action name="FileCloseAction" >
    <property name="text" >
-    <string>Close Database</string>
+    <string>&amp;Close Database</string>
    </property>
   </action>
   <action name="FileSaveAction" >
    <property name="text" >
-    <string>Save Database</string>
+    <string>&amp;Save Database</string>
    </property>
   </action>
   <action name="FileSaveAsAction" >
    <property name="text" >
-    <string>Save Database As...</string>
+    <string>Save Database &amp;As...</string>
    </property>
   </action>
   <action name="FileSettingsAction" >
    <property name="text" >
-    <string>Database Settings...</string>
+    <string>&amp;Database Settings...</string>
    </property>
   </action>
   <action name="FileChangeKeyAction" >
    <property name="text" >
-    <string>Change Master Key...</string>
+    <string>Change &amp;Master Key...</string>
    </property>
   </action>
   <action name="FileExitAction" >
    <property name="text" >
-    <string>Exit</string>
+    <string>E&amp;xit</string>
    </property>
   </action>
   <action name="FileImpPwmAction" >
@@ -466,12 +466,12 @@
   </action>
   <action name="ExtrasSettingsAction" >
    <property name="text" >
-    <string>Settings...</string>
+    <string>&amp;Settings...</string>
    </property>
   </action>
   <action name="HelpAboutAction" >
    <property name="text" >
-    <string>About...</string>
+    <string>&amp;About...</string>
    </property>
   </action>
   <action name="ViewShowStatusbarAction" >
@@ -484,7 +484,7 @@
   </action>
   <action name="HelpHandbookAction" >
    <property name="text" >
-    <string>KeePassX Handbook...</string>
+    <string>&amp;KeePassX Handbook...</string>
    </property>
   </action>
   <action name="FileExpPlainTextAction" >
@@ -530,16 +530,16 @@
  <pixmapfunction></pixmapfunction>
  <customwidgets>
   <customwidget>
-   <class>KeepassGroupView</class>
+   <class>KeepassEntryView</class>
    <extends>QTreeWidget</extends>
-   <header>../../src/lib/GroupView.h</header>
+   <header>../../src/lib/EntryView.h</header>
    <container>0</container>
    <pixmap></pixmap>
   </customwidget>
   <customwidget>
-   <class>KeepassEntryView</class>
+   <class>KeepassGroupView</class>
    <extends>QTreeWidget</extends>
-   <header>../../src/lib/EntryView.h</header>
+   <header>../../src/lib/GroupView.h</header>
    <container>0</container>
    <pixmap></pixmap>
   </customwidget>