diff --git a/apps/gtkmm/data/ui/account_widget.ui b/apps/gtkmm/data/ui/account_widget.ui
index e934c98..1a2138d 100644
--- a/apps/gtkmm/data/ui/account_widget.ui
+++ b/apps/gtkmm/data/ui/account_widget.ui
@@ -31,9 +31,9 @@
         </child>
         <child>
           <object class="GtkBox">
+            <property name="baseline-position">bottom</property>
             <property name="hexpand">True</property>
             <property name="hexpand-set">True</property>
-            <property name="homogeneous">True</property>
             <property name="spacing">4</property>
             <property name="vexpand">True</property>
             <property name="vexpand-set">True</property>
@@ -47,14 +47,18 @@
                 <property name="label">The accounts issuer</property>
                 <property name="natural-wrap-mode">none</property>
                 <property name="single-line-mode">True</property>
-                <property name="xalign">0.0</property>
-                <property name="yalign">1.800000000000001</property>
+                <property name="valign">baseline</property>
+                <property name="vexpand">True</property>
+                <property name="vexpand-set">True</property>
+                <property name="xalign">-0.0</property>
+                <property name="yalign">0.0</property>
                 <style/>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="code">
                 <property name="css-classes">account_code</property>
+                <property name="halign">end</property>
                 <property name="hexpand">True</property>
                 <property name="hexpand-set">True</property>
                 <property name="justify">fill</property>
@@ -62,8 +66,10 @@
                 <property name="lines">1</property>
                 <property name="single-line-mode">True</property>
                 <property name="valign">baseline</property>
-                <property name="xalign">1.0</property>
-                <property name="yalign">1.8</property>
+                <property name="vexpand">True</property>
+                <property name="vexpand-set">True</property>
+                <property name="xalign">0.0</property>
+                <property name="yalign">-0.0</property>
               </object>
             </child>
           </object>
diff --git a/apps/gtkmm/data/ui/authppgtk.cmb b/apps/gtkmm/data/ui/authppgtk.cmb
index 67d506c..0e72dbe 100644
--- a/apps/gtkmm/data/ui/authppgtk.cmb
+++ b/apps/gtkmm/data/ui/authppgtk.cmb
@@ -64,7 +64,7 @@
 	(2,1,"GtkWidget","margin-start","4",None,None,None,None,None,None,None,None,None),
 	(2,1,"GtkWidget","margin-top","4",None,None,None,None,None,None,None,None,None),
 	(2,7,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(2,9,"GtkBox","homogeneous","True",None,None,None,None,None,None,None,None,None),
+	(2,9,"GtkBox","baseline-position","bottom",None,None,None,None,None,None,None,None,None),
 	(2,9,"GtkBox","spacing","4",None,None,None,None,None,None,None,None,None),
 	(2,9,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(2,9,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
@@ -74,22 +74,28 @@
 	(2,11,"GtkLabel","label","123 456",None,None,None,None,None,None,None,None,None),
 	(2,11,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(2,11,"GtkLabel","single-line-mode","True",None,None,None,None,None,None,None,None,None),
-	(2,11,"GtkLabel","xalign","1.0",None,None,None,None,None,None,None,None,None),
-	(2,11,"GtkLabel","yalign","1.8",None,None,None,None,None,None,None,None,None),
+	(2,11,"GtkLabel","xalign","0.0",None,None,None,None,None,None,None,None,None),
+	(2,11,"GtkLabel","yalign","-0.0",None,None,None,None,None,None,None,None,None),
 	(2,11,"GtkWidget","css-classes","account_code",None,None,None,None,None,None,None,None,None),
+	(2,11,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(2,11,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(2,11,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
 	(2,11,"GtkWidget","valign","baseline",None,None,None,None,None,None,None,None,None),
+	(2,11,"GtkWidget","vexpand","True",None,None,None,None,None,None,None,None,None),
+	(2,11,"GtkWidget","vexpand-set","True",None,None,None,None,None,None,None,None,None),
 	(2,13,"GtkLabel","ellipsize","end",None,None,None,None,None,None,None,None,None),
 	(2,13,"GtkLabel","justify","fill",None,None,None,None,None,None,None,None,None),
 	(2,13,"GtkLabel","label","The accounts issuer",None,None,None,None,None,None,None,None,None),
 	(2,13,"GtkLabel","natural-wrap-mode","none",None,None,None,None,None,None,None,None,None),
 	(2,13,"GtkLabel","single-line-mode","True",None,None,None,None,None,None,None,None,None),
-	(2,13,"GtkLabel","xalign","0.0",None,None,None,None,None,None,None,None,None),
-	(2,13,"GtkLabel","yalign","1.800000000000001",None,None,None,None,None,None,None,None,None),
+	(2,13,"GtkLabel","xalign","-0.0",None,None,None,None,None,None,None,None,None),
+	(2,13,"GtkLabel","yalign","0.0",None,None,None,None,None,None,None,None,None),
 	(2,13,"GtkWidget","css-classes","account_issuer",None,None,None,None,None,None,None,None,None),
 	(2,13,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(2,13,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
+	(2,13,"GtkWidget","valign","baseline",None,None,None,None,None,None,None,None,None),
+	(2,13,"GtkWidget","vexpand","True",None,None,None,None,None,None,None,None,None),
+	(2,13,"GtkWidget","vexpand-set","True",None,None,None,None,None,None,None,None,None),
 	(2,14,"GtkLabel","ellipsize","end",None,None,None,None,None,None,None,None,None),
 	(2,14,"GtkLabel","justify","fill",None,None,None,None,None,None,None,None,None),
 	(2,14,"GtkLabel","label","my_account@issuer.online.com",None,None,None,None,None,None,None,None,None),