diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index caafe15..90fd88d 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -12030,7 +12030,7 @@ separately into the selected partition.</property>
                                                         <property name="orientation">vertical</property>
                                                         <property name="spacing">5</property>
                                                         <child>
-                                                          <object class="GtkBox">
+                                                          <object class="GtkBox" id="box8">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="spacing">5</property>
@@ -12059,7 +12059,7 @@ separately into the selected partition.</property>
                                                             <property name="adjustment">PartitionSize</property>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</property>
                                                             <property name="fill">True</property>
                                                             <property name="position">0</property>
                                                             </packing>
@@ -12093,7 +12093,7 @@ separately into the selected partition.</property>
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">Partition label:</property>
-                                                            <property name="xalign">0.30000001192092896</property>
+                                                            <property name="xalign">0</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -12142,26 +12142,18 @@ separately into the selected partition.</property>
                                                             <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">0</property>
+                                                            <property name="position">1</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -12174,16 +12166,7 @@ separately into the selected partition.</property>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</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>
+                                                            <property name="position">2</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -12194,7 +12177,7 @@ 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">3</property>
                                                             </packing>
                                                             </child>
                                                           </object>
@@ -12214,6 +12197,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">0</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -12222,11 +12206,6 @@ 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>
@@ -12235,41 +12214,40 @@ separately into the selected partition.</property>
                                                             </items>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">True</property>
+                                                            <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">0</property>
+                                                            <property name="position">1</property>
                                                             </packing>
                                                             </child>
                                                             <child>
-                                                            <object class="GtkLabel">
+                                                            <object class="GtkLabel" id="label16">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">Encryption password:</property>
+                                                            <property name="xalign">0</property>
                                                             </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">1</property>
+                                                            <property name="position">2</property>
                                                             </packing>
                                                             </child>
                                                             <child>
-                                                            <object class="GtkEntry" id="OSFormatEncryptionEntry">
+                                                            <object class="GtkBox" id="box9">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
+                                                            <property name="spacing">5</property>
+                                                            <child>
+                                                            <object class="GtkEntry" id="OSFormatEncryptionEntry">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">True</property>
                                                             <property name="visibility">False</property>
-                                                            <property name="invisible-char">*</property>
+                                                            <property name="invisible-char">●</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">0</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -12285,7 +12263,14 @@ 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">1</property>
+                                                            </packing>
+                                                            </child>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">True</property>
+                                                            <property name="position">5</property>
                                                             </packing>
                                                             </child>
                                                           </object>
@@ -12881,7 +12866,7 @@ separately into the selected partition.</property>
                                                             <property name="value">16</property>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</property>
                                                             <property name="fill">True</property>
                                                             <property name="position">0</property>
                                                             </packing>
@@ -12960,26 +12945,16 @@ separately into the selected partition.</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">0</property>
+                                                            <property name="position">1</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -12992,13 +12967,6 @@ separately into the selected partition.</property>
                                                             <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">3</property>
                                                             </packing>
                                                             </child>
@@ -13057,26 +13025,31 @@ separately into the selected partition.</property>
                                                             <property name="position">1</property>
                                                             </packing>
                                                             </child>
-                                                            <child>
-                                                            <object class="GtkLabel">
-                                                            <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">2</property>
+                                                            <property name="position">1</property>
                                                             </packing>
                                                             </child>
+                                                            <child>
+                                                            <object class="GtkLabel" id="label17">
+                                                            <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">1</property>
+                                                            <property name="position">2</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="GtkEntry" id="UserdataFormatEncryptionEntry">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
@@ -13084,9 +13057,9 @@ separately into the selected partition.</property>
                                                             <property name="invisible-char">*</property>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">4</property>
+                                                            <property name="position">0</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -13102,7 +13075,14 @@ separately into the selected partition.</property>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">5</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>
                                                           </object>
@@ -13523,6 +13503,27 @@ separately into the selected partition.</property>
       </object>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="PLabelSizeGroup">
+    <widgets>
+      <widget name="label9"/>
+      <widget name="label3"/>
+      <widget name="label16"/>
+      <widget name="label13"/>
+      <widget name="label12"/>
+      <widget name="label17"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="PSizeGroup">
+    <widgets>
+      <widget name="OSFormatFSMarkEntry"/>
+      <widget name="OSFormatPartitionEntry"/>
+      <widget name="box9"/>
+      <widget name="box2"/>
+      <widget name="UserdataFormatPartitionEntry"/>
+      <widget name="UserdataFormatFSMarkEntry"/>
+      <widget name="box5"/>
+    </widgets>
+  </object>
   <object class="GtkSizeGroup">
     <widgets>
       <widget name="label10"/>
@@ -13535,17 +13536,18 @@ separately into the selected partition.</property>
   </object>
   <object class="GtkSizeGroup">
     <widgets>
-      <widget name="box6"/>
-      <widget name="box7"/>
-      <widget name="box3"/>
-      <widget name="box5"/>
-      <widget name="box4"/>
+      <widget name="box1"/>
+      <widget name="NetworkDomainSwitch"/>
     </widgets>
   </object>
-  <object class="GtkSizeGroup">
+  <object class="GtkSizeGroup" id="gergSizeGroup">
     <widgets>
-      <widget name="box1"/>
-      <widget name="NetworkDomainSwitch"/>
+      <widget name="OSFilesystemTypeCombo"/>
+      <widget name="OSFormatEncryptionCombo"/>
+      <widget name="box2"/>
+      <widget name="box3"/>
+      <widget name="UserdataFilesystemTypeCombo"/>
+      <widget name="UserdataFormatEncryptionCombo"/>
     </widgets>
   </object>
 </interface>