diff --git a/eotimeseriesviewer/ui/mapviewdock.ui b/eotimeseriesviewer/ui/mapviewdock.ui
index 85e940efa0af91688046e9ca1ce55d8dabdd6ff8..e0fce0cd078fb27b1691af5dd796344200fc1183 100644
--- a/eotimeseriesviewer/ui/mapviewdock.ui
+++ b/eotimeseriesviewer/ui/mapviewdock.ui
@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>456</width>
-    <height>470</height>
+    <width>288</width>
+    <height>267</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>194</width>
-    <height>335</height>
+    <width>0</width>
+    <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -107,7 +107,7 @@
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
         <horstretch>0</horstretch>
-        <verstretch>1</verstretch>
+        <verstretch>0</verstretch>
        </sizepolicy>
       </property>
       <property name="styleSheet">
@@ -133,8 +133,8 @@ QToolBox::tab:selected { /* italicize selected tabs */
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>452</width>
-         <height>386</height>
+         <width>284</width>
+         <height>185</height>
         </rect>
        </property>
        <attribute name="icon">
@@ -389,19 +389,6 @@ QToolBox::tab:selected { /* italicize selected tabs */
       </widget>
      </widget>
     </item>
-    <item>
-     <spacer name="verticalSpacer">
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>20</width>
-        <height>0</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
    </layout>
   </widget>
   <action name="actionApplyStyles">
diff --git a/eotimeseriesviewer/ui/timeseriesviewer.ui b/eotimeseriesviewer/ui/timeseriesviewer.ui
index a5ea9d93ddd73c1eca47d995c69b176fd34e482e..6fa62ebbc8112379fa814f02142e0969afa4d7a9 100644
--- a/eotimeseriesviewer/ui/timeseriesviewer.ui
+++ b/eotimeseriesviewer/ui/timeseriesviewer.ui
@@ -224,7 +224,7 @@
   </widget>
   <widget class="QToolBar" name="toolBarData">
    <property name="windowTitle">
-    <string>toolBar</string>
+    <string>Data Toolbar</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -240,7 +240,7 @@
   </widget>
   <widget class="QToolBar" name="toolBarViews">
    <property name="windowTitle">
-    <string>toolBar_2</string>
+    <string>Map Toolbar</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -260,7 +260,7 @@
   </widget>
   <widget class="QToolBar" name="toolBarIdentify">
    <property name="windowTitle">
-    <string>toolBar_3</string>
+    <string>Identify Features Toolbar</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -278,7 +278,7 @@
   </widget>
   <widget class="QToolBar" name="toolBarEditing">
    <property name="windowTitle">
-    <string>toolBar_4</string>
+    <string>Modify &amp; Label Toolbar</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -882,7 +882,7 @@
    <property name="iconVisibleInMenu">
     <bool>false</bool>
    </property>
-   <property name="shortcutVisibleInContextMenu" stdset="0">
+   <property name="shortcutVisibleInContextMenu">
     <bool>true</bool>
    </property>
   </action>
@@ -898,6 +898,11 @@
     <string>Saves all maps as image files as PNG or JPEG images.</string>
    </property>
   </action>
+  <action name="actionToolbars">
+   <property name="text">
+    <string>Toolbars...</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>