diff --git a/src/app/puzzle/puzzlemainwindow.ui b/src/app/puzzle/puzzlemainwindow.ui
index 9f991ae41..30bb49096 100644
--- a/src/app/puzzle/puzzlemainwindow.ui
+++ b/src/app/puzzle/puzzlemainwindow.ui
@@ -37,7 +37,7 @@
       </property>
       <property name="minimumSize">
        <size>
-        <width>320</width>
+        <width>360</width>
         <height>0</height>
        </size>
       </property>
@@ -102,8 +102,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>115</width>
-             <height>41</height>
+             <width>356</width>
+             <height>779</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout">
@@ -185,7 +185,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>316</width>
+             <width>356</width>
              <height>779</height>
             </rect>
            </property>
@@ -212,47 +212,47 @@
                <item>
                 <layout class="QFormLayout" name="formLayout">
                  <item row="0" column="0">
-                  <widget class="QLabel" name="label_2">
+                  <widget class="QLabel" name="labelLayoutUnit">
                    <property name="text">
                     <string>Unit</string>
                    </property>
                   </widget>
                  </item>
                  <item row="0" column="1">
-                  <widget class="QComboBox" name="comboBox"/>
+                  <widget class="QComboBox" name="comboBoxLayoutUnit"/>
                  </item>
                  <item row="1" column="0">
-                  <widget class="QLabel" name="label_3">
+                  <widget class="QLabel" name="labelLayoutTemplate">
                    <property name="text">
-                    <string>Templates</string>
+                    <string>Template</string>
                    </property>
                   </widget>
                  </item>
                  <item row="1" column="1">
-                  <widget class="QComboBox" name="comboBox_2"/>
+                  <widget class="QComboBox" name="comboBoxLayoutTemplate"/>
                  </item>
                  <item row="2" column="0">
-                  <widget class="QLabel" name="label_4">
+                  <widget class="QLabel" name="labelLayoutwidth">
                    <property name="text">
                     <string>Width</string>
                    </property>
                   </widget>
                  </item>
                  <item row="2" column="1">
-                  <widget class="QDoubleSpinBox" name="doubleSpinBox"/>
+                  <widget class="QDoubleSpinBox" name="doubleSpinBoxLayoutWidth"/>
                  </item>
                  <item row="3" column="1">
-                  <widget class="QDoubleSpinBox" name="doubleSpinBox_2"/>
+                  <widget class="QDoubleSpinBox" name="doubleSpinBoxLayoutLength"/>
                  </item>
                  <item row="3" column="0">
-                  <widget class="QLabel" name="label_5">
+                  <widget class="QLabel" name="labelLayoutLength">
                    <property name="text">
                     <string>Length</string>
                    </property>
                   </widget>
                  </item>
                  <item row="4" column="0">
-                  <widget class="QLabel" name="label_6">
+                  <widget class="QLabel" name="labelLayoutOrientation">
                    <property name="text">
                     <string>Orientation</string>
                    </property>
@@ -261,7 +261,7 @@
                  <item row="4" column="1">
                   <layout class="QHBoxLayout" name="horizontalLayout">
                    <item>
-                    <widget class="QRadioButton" name="radioLayoutPortrait">
+                    <widget class="QRadioButton" name="radioButtonLayoutPortrait">
                      <property name="toolTip">
                       <string>Portrait</string>
                      </property>
@@ -284,7 +284,7 @@
                     </widget>
                    </item>
                    <item>
-                    <widget class="QRadioButton" name="radioButton_2">
+                    <widget class="QRadioButton" name="radioButtonLayoutLandscape">
                      <property name="toolTip">
                       <string>Landscape</string>
                      </property>
@@ -307,6 +307,13 @@
                  </item>
                 </layout>
                </item>
+               <item>
+                <widget class="QPushButton" name="pushButtonLayoutRemoveUnusedLength">
+                 <property name="text">
+                  <string>Remove unused length</string>
+                 </property>
+                </widget>
+               </item>
               </layout>
              </widget>
             </item>
@@ -395,6 +402,101 @@
               <property name="title">
                <string>Control</string>
               </property>
+              <layout class="QVBoxLayout" name="verticalLayout_6">
+               <item>
+                <layout class="QFormLayout" name="formLayout_2">
+                 <item row="0" column="0">
+                  <widget class="QLabel" name="labelLayoutFollowGrainline">
+                   <property name="text">
+                    <string>Follow grainline</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="1">
+                  <layout class="QHBoxLayout" name="horizontalLayout_4">
+                   <item>
+                    <widget class="QRadioButton" name="radioButtonLayoutFollowGrainlineNo">
+                     <property name="text">
+                      <string>No</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QRadioButton" name="radioButtonLayoutFollowGrainlineVertical">
+                     <property name="toolTip">
+                      <string>Vertical grainline</string>
+                     </property>
+                     <property name="text">
+                      <string notr="true"/>
+                     </property>
+                     <property name="icon">
+                      <iconset resource="share/resources/puzzleicon.qrc">
+                       <normaloff>:/puzzleicon/64x64/iconGrainlineVertical.png</normaloff>:/puzzleicon/64x64/iconGrainlineVertical.png</iconset>
+                     </property>
+                     <property name="iconSize">
+                      <size>
+                       <width>28</width>
+                       <height>28</height>
+                      </size>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QRadioButton" name="radioButtonLayoutFollowGrainlineHorizontal">
+                     <property name="toolTip">
+                      <string>Horizontal grainline</string>
+                     </property>
+                     <property name="text">
+                      <string notr="true"/>
+                     </property>
+                     <property name="icon">
+                      <iconset resource="share/resources/puzzleicon.qrc">
+                       <normaloff>:/puzzleicon/64x64/iconGrainlineHorizontal.png</normaloff>:/puzzleicon/64x64/iconGrainlineHorizontal.png</iconset>
+                     </property>
+                     <property name="iconSize">
+                      <size>
+                       <width>28</width>
+                       <height>28</height>
+                      </size>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item row="1" column="0">
+                  <widget class="QLabel" name="labelLayoutPiecesGap">
+                   <property name="text">
+                    <string>Pieces gap</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="1" column="1">
+                  <widget class="QDoubleSpinBox" name="doubleSpinBox"/>
+                 </item>
+                </layout>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="checkBoxLayoutWarningPiecesSuperposition">
+                 <property name="text">
+                  <string>Wargnin superposition of pieces</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="checkBoxLayoutWarningPiecesOutOfBound">
+                 <property name="text">
+                  <string>Warning pieces out of bound</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="checkBoxLayoutStickyEdges">
+                 <property name="text">
+                  <string>Sticky edges</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
              </widget>
             </item>
             <item>
@@ -402,6 +504,29 @@
               <property name="title">
                <string>Export</string>
               </property>
+              <layout class="QVBoxLayout" name="verticalLayout_7">
+               <item>
+                <layout class="QFormLayout" name="formLayout_3">
+                 <item row="0" column="0">
+                  <widget class="QLabel" name="labelLayoutExportFormat">
+                   <property name="text">
+                    <string>Format</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="1">
+                  <widget class="QComboBox" name="comboBoxLayoutExportFormat"/>
+                 </item>
+                </layout>
+               </item>
+               <item>
+                <widget class="QPushButton" name="pushButtonLayoutExport">
+                 <property name="text">
+                  <string>Export Layout</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
              </widget>
             </item>
             <item>
@@ -466,8 +591,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>98</width>
-             <height>41</height>
+             <width>356</width>
+             <height>779</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -546,8 +671,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>98</width>
-             <height>41</height>
+             <width>356</width>
+             <height>779</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_4">
diff --git a/src/app/puzzle/share/resources/puzzleicon.qrc b/src/app/puzzle/share/resources/puzzleicon.qrc
index 0eb2506df..fb33ba546 100644
--- a/src/app/puzzle/share/resources/puzzleicon.qrc
+++ b/src/app/puzzle/share/resources/puzzleicon.qrc
@@ -7,5 +7,7 @@
         <file>puzzleicon/64x64/iconTiles.png</file>
         <file>puzzleicon/64x64/iconLandscape.png</file>
         <file>puzzleicon/64x64/iconPortrait.png</file>
+        <file>puzzleicon/64x64/iconGrainlineVertical.png</file>
+        <file>puzzleicon/64x64/iconGrainlineHorizontal.png</file>
     </qresource>
 </RCC>
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconGrainlineHorizontal.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconGrainlineHorizontal.png
new file mode 100644
index 000000000..394d48fc0
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconGrainlineHorizontal.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconGrainlineVertical.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconGrainlineVertical.png
new file mode 100644
index 000000000..e2a49f1ab
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconGrainlineVertical.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_grainline_horizontal.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_grainline_horizontal.svg
new file mode 100644
index 000000000..d0609895f
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_grainline_horizontal.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 33.866666 33.866668"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="icon_grainline_horizontal.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="131.4404"
+     inkscape:cy="23.984595"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="2492"
+     inkscape:window-height="1376"
+     inkscape:window-x="68"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-263.13333)">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.08413111px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.5252585,275.18217 0.051298,3.99382 22.7141635,-0.0537 0.01533,-3.8659 5.496769,4.82839 -5.511316,4.79342 -0.03376,-3.83055 -22.7010593,-0.0398 0.042982,3.95521 -5.53642339,-4.9772 z"
+       id="path815"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_grainline_vertical.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_grainline_vertical.svg
new file mode 100644
index 000000000..22c7e42f6
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_grainline_vertical.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 33.866666 33.866668"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="icon_grainline_vertical.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="10.587649"
+     inkscape:cy="31.675878"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="2492"
+     inkscape:window-height="1376"
+     inkscape:window-x="68"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-263.13333)">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.08413111px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 21.94176,268.65855 -3.993828,0.0513 0.05369,22.71416 3.865904,0.0153 -4.828397,5.49677 -4.79342,-5.51132 3.830552,-0.0338 0.03977,-22.70106 -3.955217,0.043 4.977207,-5.53642 z"
+       id="path815"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+  </g>
+</svg>