diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog
index 6ee03aaa7..44666d41e 100644
--- a/capplets/windows/ChangeLog
+++ b/capplets/windows/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-10  Seth Nickell  <snickell@stanford.edu>
+
+	* gnome-window-properties.c: (set_wm_change_pending),
+	(state_changed), (create_dialog):
+	* gnome-window-properties.glade:
+
+	Make the glade file look a little bit better, hide the property widgets when
+	there is a window manager change pending.
+
 2002-05-10  Seth Nickell  <snickell@stanford.edu>
 
 	* .cvsignore:
diff --git a/capplets/windows/gnome-window-properties.c b/capplets/windows/gnome-window-properties.c
index bf452c340..ca6e67032 100644
--- a/capplets/windows/gnome-window-properties.c
+++ b/capplets/windows/gnome-window-properties.c
@@ -38,6 +38,7 @@ typedef struct {
 static GtkWidget *capplet;
 static GtkWidget *wm_widget;
 static GtkWidget *apply_now_button;
+static GtkWidget *properties_box;
 
 static WindowManager *selected_wm = NULL;
 
@@ -191,6 +192,13 @@ wm_widget_add_wm (WindowManager *wm, const char *row_text)
                 gtk_option_menu_set_history (GTK_OPTION_MENU (option_menu), 0);
 }
 
+static void
+set_wm_change_pending (gboolean pending)
+{
+        gtk_widget_set_sensitive (apply_now_button, pending);
+        gtk_widget_set_sensitive (properties_box, !pending);
+}
+
 static void
 response_cb (GtkDialog *dialog, gint response_id, gpointer data)
 {
@@ -206,7 +214,7 @@ response_cb (GtkDialog *dialog, gint response_id, gpointer data)
 static void
 state_changed (void)
 {
-        gtk_widget_set_sensitive (apply_now_button, TRUE);
+        set_wm_change_pending (TRUE);
 }
 
 static void
@@ -725,9 +733,12 @@ create_dialog (void)
 	dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-window-properties.glade", "prefs_widget", NULL);
         
         apply_now_button = WID ("apply_now_button");
-        gtk_widget_set_sensitive (apply_now_button, FALSE);
         g_signal_connect (G_OBJECT (apply_now_button), "clicked", apply_wm, NULL);        
 
+        properties_box = WID ("properties_box");
+
+        set_wm_change_pending (FALSE);
+
         wm_widget = wm_widget_new ();
         
         gtk_box_pack_start (GTK_BOX (WID ("wm_widget_box")), wm_widget, TRUE, TRUE, 0);
diff --git a/capplets/windows/gnome-window-properties.glade b/capplets/windows/gnome-window-properties.glade
index 1cdf7fd7a..e198b8ee2 100644
--- a/capplets/windows/gnome-window-properties.glade
+++ b/capplets/windows/gnome-window-properties.glade
@@ -2,6 +2,7 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
+<requires lib="gnome"/>
 
 <widget class="GtkWindow" id="window1">
   <property name="visible">True</property>
@@ -14,7 +15,7 @@
 
   <child>
     <widget class="GtkVBox" id="prefs_widget">
-      <property name="border_width">10</property>
+      <property name="border_width">9</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">5</property>
@@ -23,13 +24,13 @@
 	<widget class="GtkHBox" id="hbox1">
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
+	  <property name="spacing">9</property>
 
 	  <child>
 	    <widget class="GtkHBox" id="hbox4">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="spacing">3</property>
 
 	      <child>
 		<widget class="GtkLabel" id="label1">
@@ -110,110 +111,104 @@
       </child>
 
       <child>
-	<widget class="GtkVBox" id="vbox2">
+	<widget class="GtkVBox" id="properties_box">
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">10</property>
+	  <property name="spacing">9</property>
 
 	  <child>
-	    <widget class="GtkHBox" id="hbox3">
+	    <widget class="GtkVBox" id="vbox5">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">5</property>
+	      <property name="spacing">3</property>
 
 	      <child>
-		<widget class="GtkFrame" id="frame1">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkImage" id="image1">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox3">
+		<widget class="GtkVBox" id="vbox6">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">0</property>
 
 		  <child>
-		    <widget class="GtkFrame" id="frame2">
+		    <widget class="GtkLabel" id="label4">
 		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0.5</property>
-		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		      <child>
-			<widget class="GtkOptionMenu" id="optionmenu2">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="history">-1</property>
-			</widget>
-		      </child>
+		      <property name="label" translatable="yes">Window Border Appearance</property>
+		      <property name="use_underline">False</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">0</property>
+		      <property name="ypad">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
 		      <property name="expand">False</property>
-		      <property name="fill">True</property>
+		      <property name="fill">False</property>
 		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkFrame" id="frame3">
+		    <widget class="GtkOptionMenu" id="optionmenu4">
 		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0.5</property>
-		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		      <child>
-			<widget class="GtkOptionMenu" id="optionmenu3">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="history">-1</property>
-			</widget>
-		      </child>
+		      <property name="can_focus">True</property>
+		      <property name="history">-1</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
 		      <property name="expand">False</property>
-		      <property name="fill">True</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkVBox" id="vbox7">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="label5">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Titlebar Font</property>
+		      <property name="use_underline">False</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">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
 		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkFrame" id="frame4">
+		    <widget class="GnomeFontPicker" id="fontpicker1">
 		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0.5</property>
-		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		      <child>
-			<widget class="GtkOptionMenu" id="optionmenu4">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="history">-1</property>
-			</widget>
-		      </child>
+		      <property name="can_focus">True</property>
+		      <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
+		      <property name="show_size">True</property>
+		      <property name="use_font_in_label">True</property>
+		      <property name="label_font_size">14</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
 		      <property name="expand">False</property>
-		      <property name="fill">True</property>
+		      <property name="fill">False</property>
 		    </packing>
 		  </child>
 		</widget>