diff --git a/ubinstall-gtk-advanced-box.glade b/ubinstall-gtk-advanced-box.glade
index 61f8d64..386f53d 100644
--- a/ubinstall-gtk-advanced-box.glade
+++ b/ubinstall-gtk-advanced-box.glade
@@ -206,33 +206,45 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="SizeSpin">
-                        <property name="visible">True</property>
-                        <property name="can-focus">True</property>
-                        <property name="adjustment">adjustment1</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBoxText" id="SizeCombo">
+                      <object class="GtkBox" id="box1">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="active">0</property>
-                        <items>
-                          <item id="K" translatable="yes">Kb</item>
-                          <item id="M" translatable="yes">Mb</item>
-                          <item id="G" translatable="yes">Gb</item>
-                          <item id="T" translatable="yes">Tb</item>
-                        </items>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkSpinButton" id="SizeSpin">
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="adjustment">adjustment1</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkComboBoxText" id="SizeCombo">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="active">0</property>
+                            <items>
+                              <item id="K" translatable="yes">Kb</item>
+                              <item id="M" translatable="yes">Mb</item>
+                              <item id="G" translatable="yes">Gb</item>
+                              <item id="T" translatable="yes">Tb</item>
+                            </items>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
@@ -245,7 +257,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
@@ -256,146 +268,170 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">4</property>
+                        <property name="position">5</property>
                       </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="spacing">5</property>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="label" translatable="yes">File system type:</property>
+                        <property name="label" translatable="yes">Encryption:</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">5</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBoxText" id="FileSystemTypeCombo">
+                      <object class="GtkComboBoxText" id="EncryptionCombo">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="active">0</property>
                         <items>
-                          <item translatable="yes">Default</item>
+                          <item translatable="yes">Off</item>
                         </items>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">6</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="spacing">5</property>
                     <child>
-                      <object class="GtkLabel" id="label2">
+                      <object class="GtkBox" id="box2">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="label" translatable="yes">File system label:</property>
-                        <property name="xalign">0</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkEntry" id="EncryptionEntry">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can-focus">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="EncryptionButton">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="receives-default">True</property>
+                            <property name="image">image4</property>
+                            <style>
+                              <class name="thin"/>
+                            </style>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkEntry" id="FileSystemLabelEntry">
+                      <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
-                        <property name="can-focus">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes">Encryption password:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="spacing">5</property>
                     <child>
-                      <object class="GtkLabel" id="label4">
+                      <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="label" translatable="yes">Encryption:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">File system type:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBoxText" id="EncryptionCombo">
+                      <object class="GtkComboBoxText" id="FileSystemTypeCombo">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="active">0</property>
                         <items>
-                          <item translatable="yes">Off</item>
+                          <item translatable="yes">Default</item>
                         </items>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="label" translatable="yes">Encryption password:</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="EncryptionEntry">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can-focus">True</property>
+                        <property name="label" translatable="yes">File system label:</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">5</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="EncryptionButton">
+                      <object class="GtkEntry" id="FileSystemLabelEntry">
                         <property name="visible">True</property>
-                        <property name="sensitive">False</property>
                         <property name="can-focus">True</property>
-                        <property name="receives-default">True</property>
-                        <property name="image">image4</property>
-                        <style>
-                          <class name="thin"/>
-                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">6</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
               </object>
@@ -418,16 +454,32 @@
       <class name="bggrey"/>
     </style>
   </object>
+  <object class="GtkSizeGroup">
+    <widgets>
+      <widget name="box2"/>
+      <widget name="PartLabelEntry"/>
+      <widget name="FileSystemLabelEntry"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup">
+    <widgets>
+      <widget name="box1"/>
+      <widget name="EncryptionCombo"/>
+      <widget name="FileSystemTypeCombo"/>
+    </widgets>
+  </object>
   <object class="GtkSizeGroup">
     <widgets>
       <widget name="label1"/>
-      <widget name="label2"/>
+      <widget name="label4"/>
+      <widget name="label5"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup">
     <widgets>
       <widget name="label3"/>
-      <widget name="label4"/>
+      <widget name="label6"/>
+      <widget name="label2"/>
     </widgets>
   </object>
 </interface>
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index cff08b2..e997237 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -300,6 +300,13 @@
     </columns>
   </object>
   <object class="GtkSizeGroup" id="TagsSizeGroup"/>
+  <object class="GtkStack">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <child>
+      <placeholder/>
+    </child>
+  </object>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -880,7 +887,6 @@ agreement</property>
                                             <attributes>
                                               <attribute name="weight" value="bold"/>
                                               <attribute name="scale" value="1"/>
-                                              <attribute name="foreground" value="#33722f2e7a06"/>
                                               <attribute name="absolute-size" value="18432"/>
                                             </attributes>
                                           </object>
@@ -12149,6 +12155,11 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="active">1</property>
                                                             <property name="has-entry">True</property>
+                                                            <child internal-child="entry">
+                                                            <object class="GtkEntry">
+                                                            <property name="can-focus">False</property>
+                                                            </object>
+                                                            </child>
                                                             </object>
                                                             </child>
                                                             </object>
@@ -12846,7 +12857,7 @@ separately into the selected partition.</property>
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">Size:</property>
-                                                            <property name="xalign">1</property>
+                                                            <property name="xalign">0</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -12938,7 +12949,7 @@ separately into the selected partition.</property>
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">File system type:</property>
-                                                            <property name="xalign">1</property>
+                                                            <property name="xalign">0</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -12952,6 +12963,11 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="active">1</property>
                                                             <property name="has-entry">True</property>
+                                                            <child internal-child="entry">
+                                                            <object class="GtkEntry">
+                                                            <property name="can-focus">False</property>
+                                                            </object>
+                                                            </child>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -13000,7 +13016,7 @@ separately into the selected partition.</property>
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">Encryption:</property>
-                                                            <property name="xalign">1</property>
+                                                            <property name="xalign">0</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>