diff --git a/src/gui/gcal-edit-dialog.ui b/src/gui/gcal-edit-dialog.ui
index 5c2fcfaf..feb84644 100644
--- a/src/gui/gcal-edit-dialog.ui
+++ b/src/gui/gcal-edit-dialog.ui
@@ -4,6 +4,7 @@
     <property name="can_focus">False</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
+    <property name="default-width">450</property>
     <property name="window_position">center-on-parent</property>
     <property name="use_header_bar">1</property>
     <property name="destroy_with_parent">True</property>
@@ -133,425 +134,375 @@
             <property name="min_content_height">400</property>
             <property name="propagate_natural_height">true</property>
             <child>
-              <object class="GtkGrid" id="main_grid">
+              <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="border_width">18</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
+                <property name="margin">18</property>
+                <property name="spacing">12</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkLabel" id="summary_label">
+                  <object class="GtkListBox">
                     <property name="visible">True</property>
-                    <property name="xalign">1.0</property>
-                    <property name="margin-top">12</property>
-                    <property name="label" translatable="yes">Title</property>
-                    <property name="ellipsize">end</property>
+                    <property name="selection-mode">none</property>
                     <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                    <signal name="size-allocate" handler="fix_reminders_label_height_cb" object="reminders_label" swapped="no" after="yes" />
+
                     <style>
-                      <class name="dim-label"/>
+                      <class name="frame" />
                     </style>
+
+                    <!-- Summary -->
+                    <child>
+                      <object class="HdyActionRow">
+                        <property name="visible">True</property>
+                        <property name="title" translatable="yes">Title</property>
+                        <property name="activatable-widget">summary_entry</property>
+
+                        <child type="action">
+                          <object class="GtkEntry" id="summary_entry">
+                            <property name="visible">True</property>
+                            <property name="valign">center</property>
+                            <property name="can_focus">True</property>
+                            <property name="editable" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
+                            <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
+                            <signal name="notify::text" handler="on_summary_entry_changed_cb" object="GcalEditDialog" swapped="no"/>
+                          </object>
+                        </child>
+
+                      </object>
+                    </child>
+
+                    <!-- Location -->
+                    <child>
+                      <object class="HdyActionRow">
+                        <property name="visible">True</property>
+                        <property name="title" translatable="yes">Location</property>
+                        <property name="activatable-widget">location_entry</property>
+
+                        <child type="action">
+                          <object class="GtkEntry" id="location_entry">
+                            <property name="visible">True</property>
+                            <property name="valign">center</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" />
+                            <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
+                            <signal name="notify::text" handler="on_location_entry_changed_cb" object="GcalEditDialog" swapped="no"/>
+                          </object>
+                        </child>
+
+                      </object>
+                    </child>
+
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
                 </child>
+
                 <child>
-                  <object class="GtkLabel" id="dates_label">
+                  <object class="GtkListBox">
                     <property name="visible">True</property>
-                    <property name="xalign">1.0</property>
-                    <property name="margin-top">12</property>
-                    <property name="label" translatable="yes">Date</property>
+                    <property name="selection-mode">none</property>
                     <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
+
                     <style>
-                      <class name="dim-label"/>
+                      <class name="frame" />
                     </style>
+
+                    <!-- Start -->
+                    <child>
+                      <object class="HdyActionRow">
+                        <property name="visible">True</property>
+                        <property name="title" translatable="yes">Starts</property>
+                        <property name="activatable-widget">start_date_selector</property>
+
+                        <child type="action">
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="spacing">6</property>
+
+                            <child>
+                              <object class="GcalDateSelector" id="start_date_selector">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="input-hints">no-emoji</property>
+                                <signal name="notify::date" handler="sync_datetimes" object="GcalEditDialog" swapped="yes" />
+                              </object>
+                            </child>
+
+                            <child>
+                              <object class="GcalTimeSelector" id="start_time_selector">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <signal name="notify::time" handler="sync_datetimes" object="GcalEditDialog" swapped="yes" />
+                              </object>
+                            </child>
+
+                          </object>
+                        </child>
+
+                      </object>
+                    </child>
+
+                    <!-- End -->
+                    <child>
+                      <object class="HdyActionRow">
+                        <property name="visible">True</property>
+                        <property name="title" translatable="yes">Ends</property>
+                        <property name="activatable-widget">end_date_selector</property>
+
+                        <child type="action">
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="spacing">6</property>
+
+                            <child>
+                              <object class="GcalDateSelector" id="end_date_selector">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="input-hints">no-emoji</property>
+                                <signal name="notify::date" handler="sync_datetimes" object="GcalEditDialog" swapped="yes" />
+                              </object>
+                            </child>
+
+                            <child>
+                              <object class="GcalTimeSelector" id="end_time_selector">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <signal name="notify::time" handler="sync_datetimes" object="GcalEditDialog" swapped="yes" />
+                              </object>
+                            </child>
+
+                          </object>
+                        </child>
+
+                      </object>
+                    </child>
+
+                    <!-- All Day -->
+                    <child>
+                      <object class="HdyActionRow">
+                        <property name="visible">True</property>
+                        <property name="title" translatable="yes">All Day</property>
+                        <property name="activatable-widget">all_day_check</property>
+
+                        <child type="action">
+                          <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="on_all_day_check_changed_cb" object="GcalEditDialog" swapped="no"/>
+                          </object>
+                        </child>
+
+                      </object>
+                    </child>
+
+                    <!-- Repeat -->
+                    <child>
+                      <object class="HdyActionRow">
+                        <property name="visible">True</property>
+                        <property name="title" translatable="yes">Repeat</property>
+                        <property name="activatable-widget">repeat_combo</property>
+
+                        <child type="action">
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkComboBoxText" id="repeat_combo">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                                <signal name="changed" handler="on_repeat_type_changed_cb" object="GcalEditDialog" swapped="no"/>
+                                <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
+                                <items>
+                                  <item translatable="yes" id="no_repeat">No Repeat</item>
+                                  <item translatable="yes" id="daily">Daily</item>
+                                  <item translatable="yes" id="mon_fri">Monday – Friday</item>
+                                  <item translatable="yes" id="weekly">Weekly</item>
+                                  <item translatable="yes" id="monthly">Monthly</item>
+                                  <item translatable="yes" id="yearly">Yearly</item>
+                                </items>
+                                <property name="active_id">no_repeat</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="repeat_limits_box">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">6</property>
+                                <property name="hexpand">True</property>
+                                <property name="orientation">horizontal</property>
+                                <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
+                                <child>
+                                  <object class="GtkComboBoxText" id="repeat_duration_combo">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="hexpand">True</property>
+                                    <signal name="changed" handler="on_repeat_duration_changed_cb" object="GcalEditDialog" swapped="no"/>
+                                    <items>
+                                      <item translatable="yes" id="forever">Forever</item>
+                                      <item translatable="yes" id="number_of_occurrences_spin">No. of occurrences</item>
+                                      <item translatable="yes" id="until_date">Until Date</item>
+                                    </items>
+                                    <property name="active_id">forever</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkStack" id="repeat_duration_stack">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="halign">end</property>
+
+                                    <child>
+                                      <object class = "GtkSpinButton" id="number_of_occurrences_spin">
+                                        <property name="visible">True</property>
+                                        <property name="input_purpose">number</property>
+                                        <property name="input-hints">no-emoji</property>
+                                      </object>
+                                    </child>
+
+                                    <child>
+                                      <object class = "GcalDateSelector" id="until_date_selector">
+                                        <property name="visible">True</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+
+                      </object>
+                    </child>
+
+                    <!-- Reminders -->
+                    <child>
+                      <object class="HdyActionRow">
+                        <property name="visible">True</property>
+                        <property name="title" translatable="yes">Reminder</property>
+                        <property name="activatable-widget">alarms_button</property>
+
+                        <child type="action">
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="spacing">6</property>
+                            <property name="hexpand">True</property>
+                            <property name="orientation">vertical</property>
+                            <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
+                            <child>
+                              <object class="GtkMenuButton" id="alarms_button">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hexpand">True</property>
+                                <property name="popover">alarms_popover</property>
+                                <child>
+                                  <object class="GtkBox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="orientation">horizontal</property>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="xalign">0.0</property>
+                                        <property name="label" translatable="yes">Add reminder…</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="icon_name">pan-down-symbolic</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkListBox" id="alarms_listbox">
+                                <property name="visible">False</property>
+                                <property name="can_focus">False</property>
+                                <property name="selection_mode">none</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+
+                      </object>
+                    </child>
+
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="xalign">1.0</property>
-                    <property name="margin-top">12</property>
-                    <property name="label" translatable="yes">Repeat</property>
-                    <property name="ellipsize">end</property>
-                    <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="reminders_label">
-                    <property name="visible">True</property>
-                    <property name="xalign">1.0</property>
-                    <property name="margin-top">12</property>
-                    <property name="valign">start</property>
-                    <property name="label" translatable="yes">Reminders</property>
-                    <property name="ellipsize">end</property>
-                    <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">6</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="notes_label">
-                    <property name="visible">True</property>
-                    <property name="xalign">1.0</property>
-                    <property name="margin-top">12</property>
-                    <property name="valign">start</property>
-                    <property name="label" translatable="yes">Notes</property>
-                    <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">8</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="location_label">
-                    <property name="visible">True</property>
-                    <property name="xalign">1.0</property>
-                    <property name="margin-top">12</property>
-                    <property name="label" translatable="yes">Location</property>
-                    <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">7</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="summary_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="activates_default">True</property>
-                    <property name="margin-top">12</property>
-                    <property name="editable" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                    <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                    <signal name="notify::text" handler="on_summary_entry_changed_cb" object="GcalEditDialog" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">4</property>
-                  </packing>
                 </child>
+
+                <!-- Notes -->
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="margin-top">12</property>
+                    <property name="can_focus">False</property>
+                    <property name="valign">center</property>
                     <property name="spacing">6</property>
-                    <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                    <child>
-                      <object class="GcalDateSelector" id="start_date_selector">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="input-hints">no-emoji</property>
-                        <signal name="notify::date" handler="sync_datetimes" object="GcalEditDialog" swapped="yes" />
-                      </object>
-                    </child>
+                    <property name="hexpand">True</property>
+                    <property name="orientation">vertical</property>
+
                     <child>
                       <object class="GtkLabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label">-</property>
+                        <property name="hexpand">True</property>
+                        <property name="xalign">0.0</property>
+                        <property name="label" translatable="yes">Notes</property>
+                        <attributes>
+                          <attribute name="weight" value="bold" />
+                        </attributes>
                       </object>
                     </child>
+
                     <child>
-                      <object class="GcalDateSelector" id="end_date_selector">
+                      <object class="GtkScrolledWindow">
+                        <property name="min_content_height">120</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="input-hints">no-emoji</property>
-                        <signal name="notify::date" handler="sync_datetimes" object="GcalEditDialog" swapped="yes" />
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="times_label">
-                    <property name="visible">True</property>
-                    <property name="xalign">1.0</property>
-                    <property name="label" translatable="yes">Time</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="spacing">6</property>
+                        <property name="vexpand">True</property>
+                        <property name="shadow_type">in</property>
                         <child>
-                          <object class="GcalTimeSelector" id="start_time_selector">
+                          <object class="GtkTextView" id="notes_text">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <signal name="notify::time" handler="sync_datetimes" object="GcalEditDialog" swapped="yes" />
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label">-</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GcalTimeSelector" id="end_time_selector">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <signal name="notify::time" handler="sync_datetimes" object="GcalEditDialog" swapped="yes" />
+                            <property name="hexpand">True</property>
+                            <property name="top_margin">6</property>
+                            <property name="bottom_margin">6</property>
+                            <property name="left_margin">6</property>
+                            <property name="right_margin">6</property>
+                            <property name="sensitive">True</property>
+                            <property name="editable" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
+                            <property name="cursor_visible" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
+                            <property name="wrap_mode">GTK_WRAP_WORD_CHAR</property>
                           </object>
                         </child>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</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="margin-top">12</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="on_all_day_check_changed_cb" object="GcalEditDialog" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin-top">12</property>
-                    <property name="spacing">6</property>
-                    <property name="hexpand">True</property>
-                    <property name="orientation">vertical</property>
-                    <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                    <child>
-                      <object class="GtkListBox" id="alarms_listbox">
-                        <property name="visible">False</property>
-                        <property name="can_focus">False</property>
-                        <property name="selection_mode">none</property>
-                        <style>
-                          <class name="background" />
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuButton" id="alarms_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="popover">alarms_popover</property>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">horizontal</property>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
-                                <property name="xalign">0.0</property>
-                                <property name="label" translatable="yes">Add reminder…</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="icon_name">pan-down-symbolic</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">6</property>
-                    <property name="width">4</property>
-                  </packing>
-                </child>
-                <!-- combo-box with options to define the recurrence-rules !-->
-                <child>
-                  <object class="GtkComboBoxText" id="repeat_combo">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin-top">12</property>
-                    <property name="hexpand">True</property>
-                    <signal name="changed" handler="on_repeat_type_changed_cb" object="GcalEditDialog" swapped="no"/>
-                    <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                    <items>
-                      <item translatable="yes" id="no_repeat">No Repeat</item>
-                      <item translatable="yes" id="daily">Daily</item>
-                      <item translatable="yes" id="mon_fri">Monday – Friday</item>
-                      <item translatable="yes" id="weekly">Weekly</item>
-                      <item translatable="yes" id="monthly">Monthly</item>
-                      <item translatable="yes" id="yearly">Yearly</item>
-                    </items>
-                    <property name="active_id">no_repeat</property>
-                    <style>
-                      <class name="background" />
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">4</property>
-                    <property name="width">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="repeat_limits_box">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <property name="hexpand">True</property>
-                    <property name="orientation">horizontal</property>
-                    <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                    <child>
-                      <object class="GtkComboBoxText" id="repeat_duration_combo">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <signal name="changed" handler="on_repeat_duration_changed_cb" object="GcalEditDialog" swapped="no"/>
-                        <items>
-                          <item translatable="yes" id="forever">Forever</item>
-                          <item translatable="yes" id="number_of_occurrences_spin">No. of occurrences</item>
-                          <item translatable="yes" id="until_date">Until Date</item>
-                        </items>
-                        <property name="active_id">forever</property>
-                        <style>
-                          <class name="background" />
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkStack" id="repeat_duration_stack">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">end</property>
 
-                        <child>
-                          <object class = "GtkSpinButton" id="number_of_occurrences_spin">
-                            <property name="visible">True</property>
-                            <property name="input_purpose">number</property>
-                            <property name="input-hints">no-emoji</property>
-                          </object>
-                        </child>
 
-                        <child>
-                          <object class = "GcalDateSelector" id="until_date_selector">
-                            <property name="visible">True</property>
-                          </object>
-                        </child>
-                        <style>
-                          <class name="background" />
-                        </style>
-                      </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="GtkEntry" id="location_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="margin-top">12</property>
-                    <property name="secondary_icon_name">find-location-symbolic</property>
-                    <property name="editable" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                    <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                    <signal name="notify::text" handler="on_location_entry_changed_cb" object="GcalEditDialog" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">7</property>
-                    <property name="width">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="min_content_height">120</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="margin-top">12</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="top_margin">6</property>
-                        <property name="bottom_margin">6</property>
-                        <property name="left_margin">6</property>
-                        <property name="right_margin">6</property>
-                        <property name="sensitive">True</property>
-                        <property name="editable" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
-                        <property name="cursor_visible" 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">8</property>
-                    <property name="width">4</property>
-                  </packing>
-                </child>
+                <!-- Delete Button -->
                 <child>
                   <object class="GtkButton" id="delete_button">
                     <property name="visible">True</property>
+                    <property name="halign">end</property>
                     <property name="can_focus">True</property>
-                    <property name="margin-top">12</property>
                     <signal name="clicked" handler="on_action_button_clicked_cb" object="GcalEditDialog" swapped="no"/>
                     <property name="sensitive" bind-source="GcalEditDialog" bind-property="writable" bind-flags="default" />
                     <child>
@@ -564,17 +515,11 @@
                       <class name="destructive-action"/>
                     </style>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">9</property>
-                  </packing>
                 </child>
+
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="position">1</property>
-              </packing>
             </child>
+
           </object>
         </child>
       </object>