diff --git a/src/app/puzzle/puzzlemainwindow.cpp b/src/app/puzzle/puzzlemainwindow.cpp
index 2fec23266..a647d528d 100644
--- a/src/app/puzzle/puzzlemainwindow.cpp
+++ b/src/app/puzzle/puzzlemainwindow.cpp
@@ -36,6 +36,9 @@ PuzzleMainWindow::PuzzleMainWindow(QWidget *parent) :
     ui->setupUi(this);
 
     InitMenuBar();
+
+    InitPropertyTabs();
+
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -75,6 +78,17 @@ void PuzzleMainWindow::InitMenuBar()
 
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzleMainWindow::InitPropertyTabs()
+{
+    // for the MVP we don't want the tiles and current layer tabs.
+    // we remove them. As soon as we need them, delete / update this code
+    ui->tabWidgetProperties->removeTab(3); // remove layers
+    ui->tabWidgetProperties->removeTab(2); // remove tiles
+
+}
+
+
 //---------------------------------------------------------------------------------------------------------------------
 void PuzzleMainWindow::New()
 {
diff --git a/src/app/puzzle/puzzlemainwindow.h b/src/app/puzzle/puzzlemainwindow.h
index 6cf5977ee..73167d585 100644
--- a/src/app/puzzle/puzzlemainwindow.h
+++ b/src/app/puzzle/puzzlemainwindow.h
@@ -50,6 +50,7 @@ private:
     Ui::PuzzleMainWindow *ui;
 
     void InitMenuBar();
+    void InitPropertyTabs();
 
 private slots:
     void New();
diff --git a/src/app/puzzle/puzzlemainwindow.ui b/src/app/puzzle/puzzlemainwindow.ui
index 55b7f1b95..818dc3928 100644
--- a/src/app/puzzle/puzzlemainwindow.ui
+++ b/src/app/puzzle/puzzlemainwindow.ui
@@ -45,7 +45,7 @@
        <enum>QTabWidget::Rounded</enum>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <property name="iconSize">
        <size>
@@ -61,6 +61,9 @@
        <attribute name="title">
         <string/>
        </attribute>
+       <attribute name="toolTip">
+        <string>Current piece properties</string>
+       </attribute>
       </widget>
       <widget class="QWidget" name="tabLayoutProperty">
        <attribute name="icon">
@@ -70,6 +73,9 @@
        <attribute name="title">
         <string/>
        </attribute>
+       <attribute name="toolTip">
+        <string>Layout properties</string>
+       </attribute>
       </widget>
       <widget class="QWidget" name="tabTilesProperty">
        <attribute name="icon">
@@ -79,6 +85,9 @@
        <attribute name="title">
         <string/>
        </attribute>
+       <attribute name="toolTip">
+        <string>Tiles properties</string>
+       </attribute>
       </widget>
       <widget class="QWidget" name="tabLayersProperty">
        <attribute name="icon">
@@ -88,6 +97,9 @@
        <attribute name="title">
         <string/>
        </attribute>
+       <attribute name="toolTip">
+        <string>Layers properties</string>
+       </attribute>
       </widget>
      </widget>
     </item>
@@ -171,7 +183,7 @@
   </widget>
   <action name="actionOpen">
    <property name="text">
-    <string>Open</string>
+    <string>&amp;Open</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+O</string>
@@ -179,7 +191,7 @@
   </action>
   <action name="actionSave">
    <property name="text">
-    <string>Save</string>
+    <string>&amp;Save</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+S</string>
@@ -187,7 +199,7 @@
   </action>
   <action name="actionSaveAs">
    <property name="text">
-    <string>Save As</string>
+    <string>Save &amp;As</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Shift+S</string>
@@ -195,12 +207,12 @@
   </action>
   <action name="actionCloseLayout">
    <property name="text">
-    <string>Close Layout</string>
+    <string>&amp;Close Layout</string>
    </property>
   </action>
   <action name="actionImportRawLayout">
    <property name="text">
-    <string>Import Raw Layout Data</string>
+    <string>&amp;Import Raw Layout Data</string>
    </property>
   </action>
   <action name="actionExit">
@@ -220,7 +232,7 @@
   </action>
   <action name="actionNew">
    <property name="text">
-    <string>New</string>
+    <string>&amp;New</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+N</string>