diff --git a/src/glade/editevent.glade b/src/glade/editevent.glade
index 495351691..e51dbfae7 100644
--- a/src/glade/editevent.glade
+++ b/src/glade/editevent.glade
@@ -113,7 +113,7 @@
                   <object class="UndoableEntry" id="event_description">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="tooltip_text" translatable="yes">Description of the event. Leave empty if you want to autogenerate this from the tool 'Extract Event Description'.</property>
+                    <property name="tooltip_text" translatable="yes">Description of the event. Leave empty if you want to autogenerate this with the tool 'Extract Event Description'.</property>
                     <property name="invisible_char">&#x25CF;</property>
                   </object>
                   <packing>
diff --git a/src/glade/editeventref.glade b/src/glade/editeventref.glade
index 939e950d3..cf9114503 100644
--- a/src/glade/editeventref.glade
+++ b/src/glade/editeventref.glade
@@ -10,7 +10,6 @@
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox11">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label517">
             <property name="visible">True</property>
@@ -79,6 +78,7 @@
                 <child>
                   <object class="GtkComboBoxEntry" id="eer_role_combo">
                     <property name="visible">True</property>
+                    <property name="tooltip_text" translatable="yes">The role of the person in this event. Use 'Primary' for the main beneficiary, use a descriptive role otherwise (Eg., Witness, Celebrant, ...)</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -141,7 +141,7 @@
                   <object class="GtkTable" id="table62">
                     <property name="visible">True</property>
                     <property name="border_width">12</property>
-                    <property name="n_rows">6</property>
+                    <property name="n_rows">7</property>
                     <property name="n_columns">3</property>
                     <property name="column_spacing">12</property>
                     <property name="row_spacing">6</property>
@@ -260,7 +260,7 @@
                         <property name="top_attach">3</property>
                         <property name="bottom_attach">4</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
@@ -286,11 +286,10 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="eer_date_stat">
-                        <property name="width_request">33</property>
-                        <property name="height_request">33</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Show Date Editor</property>
                         <property name="relief">none</property>
                         <child>
                           <object class="GtkImage" id="eer_date_stat_child">
@@ -334,6 +333,7 @@
                     <child>
                       <object class="GtkComboBoxEntry" id="eer_type_combo">
                         <property name="visible">True</property>
+                        <property name="tooltip_text" translatable="yes">What type of event this is. Eg 'Burial', 'Graduation', ... .</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -346,6 +346,7 @@
                       <object class="UndoableEntry" id="gid">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="tooltip_text" translatable="yes">A unique ID to identify the event</property>
                         <property name="invisible_char">&#x25CF;</property>
                       </object>
                       <packing>
@@ -360,6 +361,7 @@
                       <object class="UndoableEntry" id="eer_description">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="tooltip_text" translatable="yes">Description of the event. Leave empty if you want to autogenerate this with the tool 'Extract Event Description'.</property>
                         <property name="invisible_char">&#x25CF;</property>
                       </object>
                       <packing>
@@ -389,13 +391,12 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="label521">
-                            <property name="width_request">400</property>
+                            <property name="width_request">500</property>
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="ypad">3</property>
+                            <property name="ypad">4</property>
                             <property name="label" translatable="yes">&lt;b&gt;Note:&lt;/b&gt; Any changes in the shared event information will be reflected in the event itself, for all participants in the event.</property>
                             <property name="use_markup">True</property>
-                            <property name="use_underline">True</property>
                             <property name="justify">fill</property>
                             <property name="wrap">True</property>
                           </object>
@@ -408,14 +409,14 @@
                         <property name="right_attach">3</property>
                         <property name="top_attach">5</property>
                         <property name="bottom_attach">6</property>
-                        <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                        <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                        <property name="y_options">GTK_SHRINK</property>
                       </packing>
                     </child>
                     <child>
                       <object class="ValidatableMaskedEntry" id="eer_date_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="tooltip_text" translatable="yes">Date of the event.</property>
                         <property name="invisible_char">&#x25CF;</property>
                       </object>
                       <packing>
@@ -423,6 +424,7 @@
                         <property name="right_attach">2</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
@@ -431,6 +433,15 @@
                     <child>
                       <placeholder/>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                   <packing>
                     <property name="tab_fill">False</property>
@@ -479,8 +490,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
             <property name="position">3</property>
           </packing>
         </child>