diff --git a/panels/datetime/datetime.ui b/panels/datetime/datetime.ui
index 9a078028f..c8d797104 100644
--- a/panels/datetime/datetime.ui
+++ b/panels/datetime/datetime.ui
@@ -448,194 +448,52 @@
       </object>
     </child>
   </object>
-      <object class="GtkBox" id="vbox_datetime">
+  <object class="GtkBox" id="vbox_datetime">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="margin_start">134</property>
+    <property name="margin_end">134</property>
+    <property name="margin_top">24</property>
+    <property name="margin_bottom">24</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">24</property>
+    <child>
+      <object class="GtkFrame" id="frame">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_start">134</property>
-        <property name="margin_end">134</property>
-        <property name="margin_top">24</property>
-        <property name="margin_bottom">24</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">24</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">in</property>
         <child>
-          <object class="GtkFrame" id="frame">
+          <object class="GtkListBox" id="listbox1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">in</property>
+            <property name="can_focus">True</property>
+            <property name="selection_mode">none</property>
             <child>
-              <object class="GtkListBox" id="listbox1">
+              <object class="GtkListBoxRow" id="auto-datetime-row">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="selection_mode">none</property>
                 <child>
-                  <object class="GtkListBoxRow" id="auto-datetime-row">
+                  <object class="GtkBox" id="box2">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">50</property>
                     <child>
-                      <object class="GtkBox" id="box2">
+                      <object class="GtkBox" id="box2a">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="spacing">50</property>
+                        <property name="margin_start">20</property>
+                        <property name="margin_end">20</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_bottom">6</property>
+                        <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkBox" id="box2a">
+                          <object class="GtkLabel" id="network_time_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_start">20</property>
-                            <property name="margin_end">20</property>
-                            <property name="margin_top">6</property>
-                            <property name="margin_bottom">6</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkLabel" id="network_time_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Automatic _Date &amp; Time</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">network_time_switch</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="network_time_comment">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Requires internet access</property>
-                                <style>
-                                  <class name="dim-label"/>
-                                </style>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSwitch" id="network_time_switch">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="margin_start">20</property>
-                            <property name="margin_end">20</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkListBoxRow" id="auto-timezone-row">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <child>
-                      <object class="GtkBox" id="box3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">50</property>
-                        <child>
-                          <object class="GtkBox" id="box3a">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_start">20</property>
-                            <property name="margin_end">20</property>
-                            <property name="margin_top">6</property>
-                            <property name="margin_bottom">6</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkLabel" id="auto_timezone_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Automatic Time _Zone</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">auto_timezone_switch</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="auto_timezone_comment">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Requires internet access</property>
-                                <style>
-                                  <class name="dim-label"/>
-                                </style>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSwitch" id="auto_timezone_switch">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="margin_start">20</property>
-                            <property name="margin_end">20</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkListBoxRow" id="datetime-button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <child>
-                      <object class="GtkBox" id="box4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">50</property>
-                        <child>
-                          <object class="GtkLabel" id="datetime_label1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_start">20</property>
-                            <property name="margin_end">20</property>
-                            <property name="margin_top">6</property>
-                            <property name="margin_bottom">6</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Date &amp; _Time</property>
+                            <property name="label" translatable="yes">Automatic _Date &amp; Time</property>
                             <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">network_time_switch</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -644,46 +502,72 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="datetime_label">
+                          <object class="GtkLabel" id="network_time_comment">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_start">20</property>
-                            <property name="margin_end">20</property>
-                            <property name="margin_top">6</property>
-                            <property name="margin_bottom">6</property>
                             <property name="xalign">0</property>
-                            <property name="label">20 June 2012, 6:45 AM</property>
+                            <property name="label" translatable="yes">Requires internet access</property>
+                            <style>
+                              <class name="dim-label"/>
+                            </style>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSwitch" id="network_time_switch">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="valign">center</property>
+                        <property name="margin_start">20</property>
+                        <property name="margin_end">20</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                   </object>
                 </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkListBoxRow" id="auto-timezone-row">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
                 <child>
-                  <object class="GtkListBoxRow" id="timezone-button">
+                  <object class="GtkBox" id="box3">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">50</property>
                     <child>
-                      <object class="GtkBox" id="box5">
+                      <object class="GtkBox" id="box3a">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="spacing">50</property>
+                        <property name="margin_start">20</property>
+                        <property name="margin_end">20</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_bottom">6</property>
+                        <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkLabel" id="timezone_label1">
+                          <object class="GtkLabel" id="auto_timezone_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_start">20</property>
-                            <property name="margin_end">20</property>
-                            <property name="margin_top">6</property>
-                            <property name="margin_bottom">6</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Time _Zone</property>
+                            <property name="label" translatable="yes">Automatic Time _Zone</property>
                             <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">auto_timezone_switch</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -692,106 +576,222 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="timezone_label">
+                          <object class="GtkLabel" id="auto_timezone_comment">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_start">20</property>
-                            <property name="margin_end">20</property>
-                            <property name="margin_top">6</property>
-                            <property name="margin_bottom">6</property>
                             <property name="xalign">0</property>
-                            <property name="label">GMT+1 (London, United Kingdom)</property>
+                            <property name="label" translatable="yes">Requires internet access</property>
+                            <style>
+                              <class name="dim-label"/>
+                            </style>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSwitch" id="auto_timezone_switch">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="valign">center</property>
+                        <property name="margin_start">20</property>
+                        <property name="margin_end">20</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkListBoxRow" id="datetime-button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <child>
+                  <object class="GtkBox" id="box4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">50</property>
+                    <child>
+                      <object class="GtkLabel" id="datetime_label1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_start">20</property>
+                        <property name="margin_end">20</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_bottom">6</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Date &amp; _Time</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="datetime_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_start">20</property>
+                        <property name="margin_end">20</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_bottom">6</property>
+                        <property name="xalign">0</property>
+                        <property name="label">20 June 2012, 6:45 AM</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkListBoxRow" id="timezone-button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <child>
+                  <object class="GtkBox" id="box5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">50</property>
+                    <child>
+                      <object class="GtkLabel" id="timezone_label1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_start">20</property>
+                        <property name="margin_end">20</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_bottom">6</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Time _Zone</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="timezone_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_start">20</property>
+                        <property name="margin_end">20</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_bottom">6</property>
+                        <property name="xalign">0</property>
+                        <property name="label">GMT+1 (London, United Kingdom)</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                   </object>
                 </child>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkFrame" id="timeformat-frame">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkListBox" id="listbox2">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="selection_mode">none</property>
-                <child>
-                  <object class="GtkListBoxRow" id="timeformat-row">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <child>
-                      <object class="GtkBox" id="box1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">50</property>
-                        <child>
-                          <object class="GtkLabel" id="format_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_start">20</property>
-                            <property name="margin_end">20</property>
-                            <property name="margin_top">6</property>
-                            <property name="margin_bottom">6</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Time _Format</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">format_combobox</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBoxText" id="format_combobox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="margin_start">20</property>
-                            <property name="margin_end">20</property>
-                            <items>
-                              <item id="24h" translatable="yes">24-hour</item>
-                              <item id="12h" translatable="yes">AM / PM</item>
-                            </items>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="timeformat-frame">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkListBox" id="listbox2">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="selection_mode">none</property>
+            <child>
+              <object class="GtkListBoxRow" id="timeformat-row">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <child>
+                  <object class="GtkBox" id="box1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">50</property>
+                    <child>
+                      <object class="GtkLabel" id="format_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_start">20</property>
+                        <property name="margin_end">20</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_bottom">6</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Time _Format</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">format_combobox</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="format_combobox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="valign">center</property>
+                        <property name="margin_start">20</property>
+                        <property name="margin_end">20</property>
+                        <items>
+                          <item id="24h" translatable="yes">24-hour</item>
+                          <item id="12h" translatable="yes">AM / PM</item>
+                        </items>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
   <object class="GtkSizeGroup" id="row_sizegroup">
     <property name="mode">vertical</property>
     <widgets>