diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index e367c8e37..2b331304a 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -43,4 +43,6 @@ void MainWindow::currentTabChanged(int index)
 
     actionDatabaseSave->setEnabled(hasTab);
     actionDatabaseClose->setEnabled(hasTab);
+    actionEntryNew->setEnabled(hasTab);
+    actionGroupNew->setEnabled(hasTab);
 }
diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index 1178e8256..0a9f8240a 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -36,7 +36,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>21</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -56,10 +56,44 @@
     </property>
     <addaction name="actionAbout"/>
    </widget>
+   <widget class="QMenu" name="menuEntries">
+    <property name="title">
+     <string>Entries</string>
+    </property>
+    <addaction name="actionEntryNew"/>
+    <addaction name="actionEntryEdit"/>
+    <addaction name="actionEntryDelete"/>
+   </widget>
+   <widget class="QMenu" name="menuGroups">
+    <property name="title">
+     <string>Groups</string>
+    </property>
+    <addaction name="actionGroupNew"/>
+    <addaction name="actionGroupEdit"/>
+    <addaction name="actiocGroupDelete"/>
+   </widget>
    <addaction name="menuFile"/>
+   <addaction name="menuEntries"/>
+   <addaction name="menuGroups"/>
    <addaction name="menuHelp"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <property name="movable">
+    <bool>false</bool>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionEntryNew"/>
+   <addaction name="actionEntryEdit"/>
+  </widget>
   <action name="actionQuit">
    <property name="text">
     <string>Quit</string>
@@ -96,6 +130,54 @@
     <string>New database</string>
    </property>
   </action>
+  <action name="actionEntryNew">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Add new entry</string>
+   </property>
+  </action>
+  <action name="actionEntryEdit">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>View/Edit entry</string>
+   </property>
+  </action>
+  <action name="actionEntryDelete">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Delete entry</string>
+   </property>
+  </action>
+  <action name="actionGroupNew">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Add new group</string>
+   </property>
+  </action>
+  <action name="actionGroupEdit">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Edit group</string>
+   </property>
+  </action>
+  <action name="actiocGroupDelete">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Delete group</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>