diff --git a/src/app/puzzle/vpmainwindow.cpp b/src/app/puzzle/vpmainwindow.cpp
index f41ee55ec..34ed3bd96 100644
--- a/src/app/puzzle/vpmainwindow.cpp
+++ b/src/app/puzzle/vpmainwindow.cpp
@@ -369,6 +369,9 @@ void VPMainWindow::SetPropertyTabCurrentPieceData()
 
         qreal angle = selectedPiece->GetRotation();
         SetDoubleSpinBoxValue(ui->doubleSpinBoxCurrentPieceAngle, angle);
+
+        // FIXME ---- For MVP we hide a few things. To be displayed when functions there
+        ui->groupBoxLayoutControl->hide();
     }
     else
     {
@@ -415,6 +418,10 @@ void VPMainWindow::SetPropertyTabSheetData()
 
     // set the checkboxes
     SetCheckBoxValue(ui->checkBoxSheetStickyEdges, m_layout->GetFocusedSheet()->GetStickyEdges());
+
+    // FIXME ---- For MVP we hide a few things. To be displayed when functions there
+    ui->pushButtonSheetRemoveUnusedLength->hide();
+    ui->groupBoxSheetControl->hide();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -434,12 +441,15 @@ void VPMainWindow::SetPropertyTabLayoutData()
     // set controls
     SetCheckBoxValue(ui->checkBoxLayoutWarningPiecesOutOfBound, m_layout->GetWarningPiecesOutOfBound());
     SetCheckBoxValue(ui->checkBoxLayoutWarningPiecesSuperposition, m_layout->GetWarningSuperpositionOfPieces());
+
+    // FIXME ---- For MVP we hide a few things. To be displayed when functions there
+    ui->groupBoxLayoutControl->hide();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 void VPMainWindow::SetPropertyTabTilesData()
 {
-
+// TODO
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/app/puzzle/vpmainwindow.ui b/src/app/puzzle/vpmainwindow.ui
index ab98f6eb8..0ad8dd2c2 100644
--- a/src/app/puzzle/vpmainwindow.ui
+++ b/src/app/puzzle/vpmainwindow.ui
@@ -176,7 +176,7 @@
         <enum>QTabWidget::Rounded</enum>
        </property>
        <property name="currentIndex">
-        <number>0</number>
+        <number>1</number>
        </property>
        <property name="iconSize">
         <size>