diff --git a/data/ui/edit-dialog.ui b/data/ui/edit-dialog.ui
index f88a8aef..d5efdf36 100644
--- a/data/ui/edit-dialog.ui
+++ b/data/ui/edit-dialog.ui
@@ -174,7 +174,7 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
+                <property name="top_attach">4</property>
               </packing>
             </child>
             <child>
@@ -189,7 +189,7 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">5</property>
+                <property name="top_attach">6</property>
               </packing>
             </child>
             <child>
@@ -203,7 +203,7 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">4</property>
+                <property name="top_attach">5</property>
               </packing>
             </child>
             <child>
@@ -222,61 +222,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="all_day_check">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="draw_indicator">True</property>
-                <property name="label" translatable="yes">All Day</property>
-                <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                <signal name="toggled" handler="gcal_edit_dialog_all_day_changed" object="GcalEditDialog" swapped="no"/>
-              </object>
-              <packing>
-                <property name="left_attach">3</property>
-                <property name="top_attach">1</property>
-                <property name="width">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="location_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="secondary_icon_name">find-location-symbolic</property>
-                <property name="editable" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                <signal name="notify::text" handler="update_location" object="GcalEditDialog" swapped="no"/>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">4</property>
-                <property name="width">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" id="scrolled_window">
-                <property name="height_request">120</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="vexpand">True</property>
-                <property name="shadow_type">in</property>
-                <child>
-                  <object class="GtkTextView" id="notes_text">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="left_margin">6</property>
-                    <property name="right_margin">6</property>
-                    <property name="editable" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                    <property name="wrap_mode">GTK_WRAP_WORD_CHAR</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">5</property>
-                <property name="width">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="start_date_box">
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="hexpand">True</property>
                 <property name="spacing">6</property>
@@ -341,7 +287,21 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">2</property>
-                <property name="width">3</property>
+                <property name="width">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="all_day_check">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="draw_indicator">True</property>
+                <property name="label" translatable="yes">All Day</property>
+                <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
+                <signal name="toggled" handler="gcal_edit_dialog_all_day_changed" object="GcalEditDialog" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -395,7 +355,46 @@
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
+                <property name="top_attach">4</property>
+                <property name="width">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="location_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="secondary_icon_name">find-location-symbolic</property>
+                <property name="editable" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
+                <signal name="notify::text" handler="update_location" object="GcalEditDialog" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">5</property>
+                <property name="width">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolled_window">
+                <property name="height_request">120</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="vexpand">True</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <object class="GtkTextView" id="notes_text">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="left_margin">6</property>
+                    <property name="right_margin">6</property>
+                    <property name="editable" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
+                    <property name="wrap_mode">GTK_WRAP_WORD_CHAR</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">6</property>
                 <property name="width">4</property>
               </packing>
             </child>
@@ -417,7 +416,7 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">6</property>
+                <property name="top_attach">7</property>
               </packing>
             </child>
           </object>