diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 7e090a9..ae65003 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -12083,21 +12083,9 @@ separately into the selected partition.</property>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">3</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>
-                                                          </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="label9">
                                                             <property name="visible">True</property>
@@ -12108,7 +12096,7 @@ separately into the selected partition.</property>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">0</property>
+                                                            <property name="position">2</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -12117,16 +12105,16 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">True</property>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">1</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>
+                                                            <property name="position">0</property>
                                                           </packing>
                                                         </child>
                                                         <child>
@@ -12148,35 +12136,27 @@ separately into the selected partition.</property>
                                                             </packing>
                                                             </child>
                                                             <child>
+                                                            <object class="GtkAlignment">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">False</property>
+                                                            <child>
+                                                            <object class="GtkBox" id="box6">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">False</property>
+                                                            <property name="spacing">5</property>
+                                                            <child>
                                                             <object class="GtkComboBoxText" id="OSFilesystemTypeCombo">
                                                             <property name="visible">True</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">True</property>
-                                                            </object>
-                                                            </child>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">1</property>
+                                                            <property name="position">0</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="label3">
                                                             <property name="visible">True</property>
@@ -12187,7 +12167,16 @@ separately into the selected partition.</property>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">0</property>
+                                                            <property name="position">1</property>
+                                                            </packing>
+                                                            </child>
+                                                            </object>
+                                                            </child>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">True</property>
+                                                            <property name="position">1</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -12196,16 +12185,16 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">True</property>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">1</property>
+                                                            <property name="position">2</property>
                                                             </packing>
                                                             </child>
                                                           </object>
                                                           <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">3</property>
+                                                            <property name="position">2</property>
                                                           </packing>
                                                         </child>
                                                         <child>
@@ -12214,7 +12203,7 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="spacing">5</property>
                                                             <child>
-                                                            <object class="GtkLabel">
+                                                            <object class="GtkLabel" id="label15">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">Encryption:</property>
@@ -12226,6 +12215,11 @@ separately into the selected partition.</property>
                                                             </packing>
                                                             </child>
                                                             <child>
+                                                            <object class="GtkBox" id="box7">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">False</property>
+                                                            <property name="spacing">5</property>
+                                                            <child>
                                                             <object class="GtkComboBoxText" id="OSFormatEncryptionCombo">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
@@ -12234,9 +12228,9 @@ separately into the selected partition.</property>
                                                             </items>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">1</property>
+                                                            <property name="position">0</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -12248,7 +12242,14 @@ separately into the selected partition.</property>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">2</property>
+                                                            <property name="position">1</property>
+                                                            </packing>
+                                                            </child>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">True</property>
+                                                            <property name="position">1</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -12257,7 +12258,7 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">True</property>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</property>
                                                             <property name="fill">True</property>
                                                             <property name="position">3</property>
                                                             </packing>
@@ -12849,7 +12850,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">0</property>
+                                                            <property name="xalign">1</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -12897,21 +12898,9 @@ separately into the selected partition.</property>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">3</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>
-                                                          </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="label13">
                                                             <property name="visible">True</property>
@@ -12922,7 +12911,7 @@ separately into the selected partition.</property>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">0</property>
+                                                            <property name="position">2</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -12931,16 +12920,16 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">True</property>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</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">1</property>
+                                                            <property name="position">0</property>
                                                           </packing>
                                                         </child>
                                                         <child>
@@ -12953,44 +12942,32 @@ 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">0</property>
+                                                            <property name="xalign">1</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="GtkBox" id="box5">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">False</property>
+                                                            <property name="spacing">5</property>
+                                                            <child>
                                                             <object class="GtkComboBoxText" id="UserdataFilesystemTypeCombo">
                                                             <property name="visible">True</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">True</property>
-                                                            </object>
-                                                            </child>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">3</property>
+                                                            <property name="position">0</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="label12">
                                                             <property name="visible">True</property>
@@ -13001,7 +12978,14 @@ separately into the selected partition.</property>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">0</property>
+                                                            <property name="position">1</property>
+                                                            </packing>
+                                                            </child>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">True</property>
+                                                            <property name="position">3</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -13010,16 +12994,16 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">True</property>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</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">3</property>
+                                                            <property name="position">2</property>
                                                           </packing>
                                                         </child>
                                                         <child>
@@ -13028,10 +13012,11 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="spacing">5</property>
                                                             <child>
-                                                            <object class="GtkLabel">
+                                                            <object class="GtkLabel" id="label14">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">Encryption:</property>
+                                                            <property name="xalign">1</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -13040,6 +13025,11 @@ separately into the selected partition.</property>
                                                             </packing>
                                                             </child>
                                                             <child>
+                                                            <object class="GtkBox" id="box4">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">False</property>
+                                                            <property name="spacing">5</property>
+                                                            <child>
                                                             <object class="GtkComboBoxText" id="UserdataFormatEncryptionCombo">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
@@ -13048,7 +13038,7 @@ separately into the selected partition.</property>
                                                             </items>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</property>
                                                             <property name="fill">True</property>
                                                             <property name="position">1</property>
                                                             </packing>
@@ -13065,15 +13055,22 @@ separately into the selected partition.</property>
                                                             <property name="position">2</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="GtkEntry" id="UserdataFormatEncryptionEntry">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">True</property>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">3</property>
+                                                            <property name="position">4</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -13089,7 +13086,7 @@ separately into the selected partition.</property>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">4</property>
+                                                            <property name="position">5</property>
                                                             </packing>
                                                             </child>
                                                           </object>
@@ -13509,28 +13506,23 @@ separately into the selected partition.</property>
       </object>
     </child>
   </object>
-  <object class="GtkSizeGroup" id="OsOnlySizeGroup">
+  <object class="GtkSizeGroup">
     <widgets>
-      <widget name="box2"/>
-      <widget name="OSFilesystemTypeCombo"/>
-      <widget name="OSFormatFSMarkEntry"/>
-      <widget name="OSFormatPartitionEntry"/>
-      <widget name="UserdataFormatPartitionEntry"/>
-      <widget name="UserdataFormatFSMarkEntry"/>
-      <widget name="UserdataFilesystemTypeCombo"/>
-      <widget name="box3"/>
+      <widget name="label10"/>
+      <widget name="label11"/>
+      <widget name="label14"/>
+      <widget name="label4"/>
+      <widget name="label1"/>
+      <widget name="label15"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup">
     <widgets>
-      <widget name="label1"/>
-      <widget name="label3"/>
-      <widget name="label4"/>
-      <widget name="label9"/>
-      <widget name="label10"/>
-      <widget name="label11"/>
-      <widget name="label12"/>
-      <widget name="label13"/>
+      <widget name="box6"/>
+      <widget name="box7"/>
+      <widget name="box3"/>
+      <widget name="box5"/>
+      <widget name="box4"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup">