diff --git a/usr/share/lxdm/themes/Lubuntu/greeter.ui b/usr/share/lxdm/themes/Lubuntu/greeter.ui
index 7bb58ee..3f9f67c 100644
--- a/usr/share/lxdm/themes/Lubuntu/greeter.ui
+++ b/usr/share/lxdm/themes/Lubuntu/greeter.ui
@@ -91,11 +91,11 @@
             <child>
               <object class="GtkHBox" id="bottom_hbox">
                 <property name="visible">True</property>
-                <property name="border_width">6</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkHBox" id="sessions_box">
                     <property name="visible">True</property>
+                    <property name="border_width">15</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkImage" id="image2">
@@ -136,6 +136,7 @@
                 <child>
                   <object class="GtkHBox" id="lang_box">
                     <property name="visible">True</property>
+                    <property name="border_width">15</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkImage" id="image3">
@@ -174,21 +175,31 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="label" translatable="yes">Keyboard Layout:</property>
+                  <object class="GtkHBox" id="hbox1">
+                    <property name="visible">True</property>
+                    <property name="border_width">15</property>
+                    <child>
+                      <object class="GtkLabel" id="label3">
+                        <property name="label" translatable="yes">Keyboard Layout:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="keyboard"/>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkComboBox" id="keyboard"/>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkButton" id="exit">
                     <property name="label">Exit</property>
@@ -201,7 +212,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="pack_type">end</property>
-                    <property name="position">4</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
               </object>