diff --git a/ubinstall-gtk-user.glade b/ubinstall-gtk-user.glade
index 5e3ebba..3c8c438 100644
--- a/ubinstall-gtk-user.glade
+++ b/ubinstall-gtk-user.glade
@@ -41,10 +41,11 @@
                 <property name="can-focus">False</property>
                 <property name="spacing">5</property>
                 <child>
-                  <object class="GtkLabel">
+                  <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="label" translatable="yes">Account name:</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -93,11 +94,11 @@
                 <property name="can-focus">False</property>
                 <property name="spacing">5</property>
                 <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">Login:</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -144,11 +145,11 @@
                 <property name="can-focus">False</property>
                 <property name="spacing">5</property>
                 <child>
-                  <object class="GtkLabel">
+                  <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="label" translatable="yes">Password:</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -230,4 +231,11 @@
       <class name="bggrey"/>
     </style>
   </object>
+  <object class="GtkSizeGroup">
+    <widgets>
+      <widget name="label1"/>
+      <widget name="label2"/>
+      <widget name="label3"/>
+    </widgets>
+  </object>
 </interface>
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 57d060a..71a94da 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -5535,10 +5535,11 @@ Select a different installation source.</property>
                                                     <property name="can-focus">False</property>
                                                     <property name="spacing">5</property>
                                                     <child>
-                                                      <object class="GtkLabel">
+                                                      <object class="GtkLabel" id="label20">
                                                         <property name="visible">True</property>
                                                         <property name="can-focus">False</property>
                                                         <property name="label" translatable="yes">Account name:</property>
+                                                        <property name="xalign">1</property>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">False</property>
@@ -5573,11 +5574,11 @@ Select a different installation source.</property>
                                                     <property name="can-focus">False</property>
                                                     <property name="spacing">5</property>
                                                     <child>
-                                                      <object class="GtkLabel">
+                                                      <object class="GtkLabel" id="label23">
                                                         <property name="visible">True</property>
                                                         <property name="can-focus">False</property>
                                                         <property name="label" translatable="yes">Login:</property>
-                                                        <property name="xalign">0</property>
+                                                        <property name="xalign">1</property>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">False</property>
@@ -5612,11 +5613,11 @@ Select a different installation source.</property>
                                                     <property name="can-focus">False</property>
                                                     <property name="spacing">5</property>
                                                     <child>
-                                                      <object class="GtkLabel">
+                                                      <object class="GtkLabel" id="label24">
                                                         <property name="visible">True</property>
                                                         <property name="can-focus">False</property>
-                                                        <property name="label" translatable="yes">Administrator password (root):</property>
-                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">Password:</property>
+                                                        <property name="xalign">1</property>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">False</property>
@@ -10325,6 +10326,9 @@ separately into the selected partition.</property>
                                                     <property name="can-focus">True</property>
                                                     <property name="model">DevicesList</property>
                                                     <property name="search-column">0</property>
+                                                    <child internal-child="selection">
+                                                      <object class="GtkTreeSelection"/>
+                                                    </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
                                                         <child>
@@ -13600,6 +13604,9 @@ separately into the selected partition.</property>
                                                     <property name="can-focus">True</property>
                                                     <property name="model">DevicesList</property>
                                                     <property name="search-column">0</property>
+                                                    <child internal-child="selection">
+                                                      <object class="GtkTreeSelection"/>
+                                                    </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
                                                         <property name="title" translatable="yes">Device</property>
@@ -13700,6 +13707,9 @@ separately into the selected partition.</property>
                                                     <property name="can-focus">True</property>
                                                     <property name="model">PartitionsList</property>
                                                     <property name="search-column">0</property>
+                                                    <child internal-child="selection">
+                                                      <object class="GtkTreeSelection"/>
+                                                    </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
                                                         <property name="title" translatable="yes">Section</property>
@@ -14627,6 +14637,13 @@ separately into the selected partition.</property>
       <widget name="box5"/>
     </widgets>
   </object>
+  <object class="GtkSizeGroup" id="RootUserSizeGroup">
+    <widgets>
+      <widget name="label20"/>
+      <widget name="label23"/>
+      <widget name="label24"/>
+    </widgets>
+  </object>
   <object class="GtkSizeGroup">
     <widgets>
       <widget name="label10"/>