diff --git a/ui/addhardware.ui b/ui/addhardware.ui
index 54dc695f8..32beb4fc1 100644
--- a/ui/addhardware.ui
+++ b/ui/addhardware.ui
@@ -79,13 +79,13 @@
                       <object class="GtkLabel" id="page-title-label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
                         <property name="xpad">6</property>
                         <property name="ypad">6</property>
                         <property name="label">Page title</property>
                         <property name="use_markup">True</property>
                         <property name="justify">fill</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
                       </object>
                     </child>
                   </object>
@@ -155,10 +155,10 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
+                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Device type:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">config-storage-devtype</property>
-                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -186,10 +186,10 @@
                                   <object class="GtkLabel" id="label21">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Bus type:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">config-storage-bustype</property>
-                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -228,10 +228,10 @@
                                       <object class="GtkLabel" id="label1">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
+                                        <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Stor_age format:</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">storage-format-combobox-entry</property>
-                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">0</property>
@@ -242,10 +242,10 @@
                                       <object class="GtkLabel" id="label28">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
+                                        <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Cac_he mode:</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">config-storage-cache</property>
-                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">0</property>
@@ -323,10 +323,10 @@
                               <object class="GtkLabel" id="label29">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Type:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">controller-type</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -337,10 +337,10 @@
                               <object class="GtkLabel" id="controller-model-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Model:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">controller-model</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -460,11 +460,11 @@
                                   <object class="GtkLabel" id="label386">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_MAC address:</property>
                                     <property name="use_markup">True</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">create-mac-address</property>
-                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -475,10 +475,10 @@
                                   <object class="GtkLabel" id="label6">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Device mode_l:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">net-model</property>
-                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -582,10 +582,10 @@
                               <object class="GtkLabel" id="label395">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">1</property>
                                 <property name="label" translatable="yes">_Type:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">input-type</property>
-                                <property name="xalign">1</property>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -666,10 +666,10 @@
                               <object class="GtkLabel" id="label10">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">1</property>
                                 <property name="label" translatable="yes">_Model:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">sound-model</property>
-                                <property name="xalign">1</property>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -703,11 +703,11 @@
                               <object class="GtkLabel" id="label20">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="xpad">1</property>
                                 <property name="label" translatable="yes">Host _Device:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">host-device</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -812,10 +812,10 @@
                                   <object class="GtkLabel" id="char-port-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Port:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">char-port</property>
-                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -861,10 +861,10 @@
                                   <object class="GtkLabel" id="char-bind-port-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Po_rt:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">char-bind-port</property>
-                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -894,10 +894,10 @@
                               <object class="GtkLabel" id="char-path-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Path:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">char-path</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -908,10 +908,10 @@
                               <object class="GtkLabel" id="char-mode-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Mode:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">char-mode</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -922,10 +922,10 @@
                               <object class="GtkLabel" id="char-host-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">H_ost:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">char-host</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -936,10 +936,10 @@
                               <object class="GtkLabel" id="char-bind-host-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Bind Host:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">char-mode</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -950,10 +950,10 @@
                               <object class="GtkLabel" id="char-use-telnet-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Use Te_lnet:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">char-use-telnet</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -964,10 +964,10 @@
                               <object class="GtkLabel" id="label9">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Device _Type:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">char-device-type</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -990,10 +990,10 @@
                               <object class="GtkLabel" id="char-target-type-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">T_ype:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">char-target-type</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -1015,10 +1015,10 @@
                               <object class="GtkLabel" id="char-target-name-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Name:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">combobox-entry</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -1075,10 +1075,10 @@
                               <object class="GtkLabel" id="char-channel-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Channel:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">char-channel</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -1134,10 +1134,10 @@
                               <object class="GtkLabel" id="label23">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Model:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">video-model</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -1184,10 +1184,10 @@
                               <object class="GtkLabel" id="label26">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Model:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">watchdog-model</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -1286,10 +1286,10 @@
                               <object class="GtkLabel" id="label30">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">1</property>
                                 <property name="label" translatable="yes">_Mode:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">smartcard-mode</property>
-                                <property name="xalign">1</property>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -1339,10 +1339,10 @@
                                   <object class="GtkLabel" id="label439">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Port:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">usbredir-service</property>
-                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1373,9 +1373,10 @@
                               <object class="GtkLabel" id="label3213">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">1</property>
                                 <property name="label" translatable="yes">_Type:</property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">1</property>
+                                <property name="mnemonic_widget">usbredir-list</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -1386,10 +1387,10 @@
                               <object class="GtkLabel" id="label438">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">1</property>
                                 <property name="label" translatable="yes">_Host:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">usbredir-host</property>
-                                <property name="xalign">1</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -1446,10 +1447,10 @@
                               <object class="GtkLabel" id="tpm-device-path-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Device _Path:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">tpm-device-path</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -1471,10 +1472,10 @@
                               <object class="GtkLabel" id="label35">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">1</property>
                                 <property name="label" translatable="yes">_Backend:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">tpm-type</property>
-                                <property name="xalign">1</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -1507,10 +1508,10 @@
                               <object class="GtkLabel" id="label4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Type:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">rng-type</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -1532,10 +1533,10 @@
                               <object class="GtkLabel" id="label8">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Backend Type:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">rng-backend-type</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -1557,10 +1558,10 @@
                               <object class="GtkLabel" id="label12">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Backend _Mode:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">rng-backend-mode</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -1582,10 +1583,10 @@
                               <object class="GtkLabel" id="label17">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Host:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">rng-connect-host</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -1613,10 +1614,10 @@
                                   <object class="GtkLabel" id="char-port-label1">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Port:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">rng-connect-service</property>
-                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1647,10 +1648,10 @@
                               <object class="GtkLabel" id="rng-bind-host-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">B_ind Host:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">rng-bind-host</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -1678,10 +1679,10 @@
                                   <object class="GtkLabel" id="char-port-label2">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">P_ort:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">rng-bind-service</property>
-                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1712,10 +1713,10 @@
                               <object class="GtkLabel" id="label5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Device:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">rng-device</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -1759,10 +1760,10 @@
                               <object class="GtkLabel" id="panic-type-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Address _Type:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">panic-type</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -1783,10 +1784,10 @@
                               <object class="GtkLabel" id="panic-iobase-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_IO Base:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">panic-iobase</property>
-                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>