diff --git a/glade/prefs.glade b/glade/prefs.glade
index 437d09e..71b9274 100644
--- a/glade/prefs.glade
+++ b/glade/prefs.glade
@@ -75,8 +75,8 @@
 	    <widget class="GtkScrolledWindow" id="scrolledwindow1">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 	      <property name="shadow_type">GTK_SHADOW_IN</property>
 	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
@@ -130,8 +130,8 @@
 		<widget class="GtkScrolledWindow" id="scrolledwindow2">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
@@ -141,7 +141,7 @@
 		      <property name="shadow_type">GTK_SHADOW_IN</property>
 
 		      <child>
-			<widget class="GtkVBox" id="vbox2">
+			<widget class="GtkVBox" id="main_group_holder">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">0</property>
@@ -178,7 +178,7 @@
 					<widget class="GtkTable" id="table1">
 					  <property name="border_width">5</property>
 					  <property name="visible">True</property>
-					  <property name="n_rows">3</property>
+					  <property name="n_rows">2</property>
 					  <property name="n_columns">3</property>
 					  <property name="homogeneous">False</property>
 					  <property name="row_spacing">3</property>
@@ -447,26 +447,6 @@
 					      <property name="fill">False</property>
 					    </packing>
 					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
 					</widget>
 				      </child>
 				    </widget>
@@ -544,34 +524,6 @@
 					      <property name="fill">False</property>
 					    </packing>
 					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
 					</widget>
 				      </child>
 				    </widget>
@@ -635,7 +587,7 @@
 					    <widget class="GtkCheckButton" id="ch_quit">
 					      <property name="visible">True</property>
 					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">Confirm quit</property>
+					      <property name="label" translatable="yes">Confirm quit if there are unsaved data</property>
 					      <property name="use_underline">True</property>
 					      <property name="relief">GTK_RELIEF_NORMAL</property>
 					      <property name="focus_on_click">True</property>
@@ -651,10 +603,10 @@
 					  </child>
 
 					  <child>
-					    <widget class="GtkCheckButton" id="ch_unsaved">
+					    <widget class="GtkCheckButton" id="ch_warnnew">
 					      <property name="visible">True</property>
 					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">Warn about unsaved data</property>
+					      <property name="label" translatable="yes">Confirm &quot;new&quot; if there are unsaved data</property>
 					      <property name="use_underline">True</property>
 					      <property name="relief">GTK_RELIEF_NORMAL</property>
 					      <property name="focus_on_click">True</property>
@@ -670,27 +622,22 @@
 					  </child>
 
 					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
+					    <widget class="GtkCheckButton" id="ch_wrnmount">
+					      <property name="visible">True</property>
+					      <property name="can_focus">True</property>
+					      <property name="label" translatable="yes">Warn about mount/umount errors</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>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
 					  </child>
 					</widget>
 				      </child>
@@ -820,26 +767,6 @@
 					      <property name="fill">False</property>
 					    </packing>
 					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
 					</widget>
 				      </child>
 				    </widget>
@@ -877,10 +804,6 @@
 			      <property name="fill">True</property>
 			    </packing>
 			  </child>
-
-			  <child>
-			    <placeholder/>
-			  </child>
 			</widget>
 		      </child>
 		    </widget>