diff --git a/ubinstall-gtk-kernel-row.glade b/ubinstall-gtk-kernel-row.glade
index 1d9ee69..a176e9a 100644
--- a/ubinstall-gtk-kernel-row.glade
+++ b/ubinstall-gtk-kernel-row.glade
@@ -26,7 +26,7 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
             <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
diff --git a/ubinstall-gtk-os-row.glade b/ubinstall-gtk-os-row.glade
index b9ff25b..58c5b7e 100644
--- a/ubinstall-gtk-os-row.glade
+++ b/ubinstall-gtk-os-row.glade
@@ -6,7 +6,7 @@
   <object class="GtkBox" id="TableRow">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="spacing">11</property>
+    <property name="spacing">5</property>
     <child>
       <object class="GtkCheckButton" id="InstallCheck">
         <property name="visible">True</property>
@@ -14,36 +14,73 @@
         <property name="receives-default">False</property>
         <property name="active">True</property>
         <property name="draw-indicator">True</property>
-      </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="margin-top">1</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">1</property>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="spacing">7</property>
+            <property name="margin-top">1</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">1</property>
             <child>
-              <object class="GtkLabel" id="NameLabel">
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes">Name</property>
-                <property name="width-chars">0</property>
-                <property name="track-visited-links">False</property>
-                <property name="xalign">0</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
+                <property name="spacing">7</property>
+                <child>
+                  <object class="GtkLabel" id="NameLabel">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">Name</property>
+                    <property name="width-chars">0</property>
+                    <property name="track-visited-links">False</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="VersionLabel">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">Version</property>
+                    <property name="use-markup">True</property>
+                    <property name="width-chars">15</property>
+                    <property name="track-visited-links">False</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>
+                <child>
+                  <object class="GtkBox" id="TagsBox">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="valign">start</property>
+                    <property name="margin-top">3</property>
+                    <property name="margin-bottom">5</property>
+                    <property name="spacing">2</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">6</property>
+                  </packing>
+                </child>
+                <style>
+                  <class name="selection"/>
+                </style>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -52,81 +89,39 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="VersionLabel">
+              <object class="GtkLabel" id="DescriptionLabel">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes">Version</property>
-                <property name="use-markup">True</property>
-                <property name="width-chars">15</property>
-                <property name="track-visited-links">False</property>
+                <property name="margin-bottom">2</property>
+                <property name="label" translatable="yes">Description</property>
                 <property name="xalign">0</property>
+                <property name="yalign">0</property>
               </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">True</property>
+                <property name="pack-type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="TagsBox">
+              <object class="GtkSeparator">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="valign">start</property>
-                <property name="margin-top">3</property>
-                <property name="margin-bottom">5</property>
-                <property name="spacing">2</property>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">6</property>
+                <property name="position">2</property>
               </packing>
             </child>
-            <style>
-              <class name="selection"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="DescriptionLabel">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="margin-bottom">2</property>
-            <property name="label" translatable="yes">Description</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="pack-type">end</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSeparator">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
         </child>
       </object>
       <packing>
         <property name="expand">True</property>
         <property name="fill">True</property>
-        <property name="position">1</property>
+        <property name="position">0</property>
       </packing>
     </child>
     <style>