diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 705f82388..4c890ba92 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-11  Alex Roitman  <shura@alex.neuro.umn.edu>
+	* src/plugins/EventCmp.py: Remove extra code.
+	* src/plugins/eventcmp.glade: Remove extra widgets. 
+
 2004-05-10  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* src/plugins/FilterEditor.py: Clean up window management.
 	* src/rule.glade: Define event handlers.
diff --git a/gramps2/src/plugins/EventCmp.py b/gramps2/src/plugins/EventCmp.py
index f88232025..b6302e8bd 100644
--- a/gramps2/src/plugins/EventCmp.py
+++ b/gramps2/src/plugins/EventCmp.py
@@ -411,16 +411,11 @@ class DisplayChart:
         self.form = gtk.glade.XML(self.glade_file,"dialog1","gramps")
         self.form.signal_autoconnect({
             "on_save_clicked"       : self.on_save_clicked,
-            "on_html_toggled"       : self.on_html_toggled,
             "destroy_passed_object" : Utils.destroy_passed_object
             })
         self.save_form = self.form.get_widget("dialog1")
         self.save_form.show_all()
 
-    def on_html_toggled(self,obj):
-        active = self.form.get_widget("html").get_active()
-        self.form.get_widget("htmltemplate").set_sensitive(active)
-
     def on_save_clicked(self,obj):
         
         name = unicode(self.form.get_widget("filename").get_text())
diff --git a/gramps2/src/plugins/eventcmp.glade b/gramps2/src/plugins/eventcmp.glade
index 1fdf4f4f9..bfcb4b1cb 100644
--- a/gramps2/src/plugins/eventcmp.glade
+++ b/gramps2/src/plugins/eventcmp.glade
@@ -69,7 +69,7 @@
       <child>
 	<widget class="GtkTable" id="table2">
 	  <property name="visible">True</property>
-	  <property name="n_rows">6</property>
+	  <property name="n_rows">2</property>
 	  <property name="n_columns">3</property>
 	  <property name="homogeneous">False</property>
 	  <property name="row_spacing">6</property>
@@ -78,7 +78,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="labelTitle">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;File _name&lt;/b&gt;</property>
+	      <property name="label" translatable="yes">&lt;b&gt;_File name&lt;/b&gt;</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -101,77 +101,6 @@
 	    </packing>
 	  </child>
 
-	  <child>
-	    <widget class="GtkRadioButton" id="openoffice">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">OpenOffice.org _Spreadsheet</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">True</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkRadioButton" id="html">
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_HTML</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	      <property name="group">openoffice</property>
-	      <signal name="toggled" handler="on_html_toggled" object="dialog1"/>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label11">
-	      <property name="label" translatable="yes">HTML _Template:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">5</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">htmlfile</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">5</property>
-	      <property name="bottom_attach">6</property>
-	      <property name="x_padding">6</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
 	  <child>
 	    <widget class="GnomeFileEntry" id="fileentry1">
 	      <property name="visible">True</property>
@@ -185,6 +114,7 @@
 	      <child internal-child="entry">
 		<widget class="GtkEntry" id="filename">
 		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Select file to save OpenOffice.org spreadsheet</property>
 		  <property name="can_focus">True</property>
 		  <property name="editable">True</property>
 		  <property name="visibility">True</property>
@@ -205,69 +135,9 @@
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
-
-	  <child>
-	    <widget class="GnomeFileEntry" id="htmltemplate">
-	      <property name="sensitive">False</property>
-	      <property name="history_id">HtmlTemplate</property>
-	      <property name="max_saved">10</property>
-	      <property name="browse_dialog_title" translatable="yes">Choose the HTML template</property>
-	      <property name="directory_entry">False</property>
-	      <property name="modal">False</property>
-	      <property name="use_filechooser">False</property>
-
-	      <child internal-child="entry">
-		<widget class="GtkEntry" id="htmlfile">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">5</property>
-	      <property name="bottom_attach">6</property>
-	      <property name="x_padding">6</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label13">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;_Format&lt;/b&gt;</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">openoffice</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
 	</widget>
 	<packing>
-	  <property name="padding">0</property>
+	  <property name="padding">6</property>
 	  <property name="expand">True</property>
 	  <property name="fill">True</property>
 	</packing>