diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index 29e42dbc8..755700875 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -6,10 +6,29 @@
   <layout>vbox</layout>
   <padding>20</padding>
 
-  <text>
-    <label>Rendering Options</label>
-  </text>
-
+  <group>
+    <layout>hbox</layout>
+    <empty><stretch>1</stretch></empty>
+	
+	<text>
+	  <label>Rendering options</label>
+	</text>
+    
+	<empty><stretch>1</stretch></empty>
+		
+	<button>
+	  <pref-width>16</pref-width>
+	  <pref-height>16</pref-height>
+	  <legend></legend>
+	  <default>1</default>
+	  <keynum>27</keynum>
+	  <border>2</border>
+	  <binding>
+	  	<command>dialog-close</command>
+	  </binding>
+	</button>
+  </group>
+  
   <hrule/>
 
   <group>
@@ -18,11 +37,19 @@
 
     <group>
       <layout>vbox</layout>
-
-      <text>
-        <halign>left</halign>
-        <label>Lighting</label>
-      </text>
+	  
+	  <!--
+	  
+	  <group>
+        <layout>hbox</layout>
+	    <text>
+          <label>Lighting</label>
+          <halign>left</halign>
+        </text>
+	    <hrule>
+          <stretch>true</stretch>
+        </hrule>
+	  </group>
 
       <checkbox>
         <halign>left</halign>
@@ -68,17 +95,23 @@
           <command>dialog-apply</command>
         </binding>
       </checkbox>
+	  
+	  -->
 
-      <hrule/>
-
-      <text>
-        <halign>left</halign>
-        <label>Objects</label>
-      </text>
+      <group>
+        <layout>hbox</layout>
+	    <text>
+          <label>Objects</label>
+          <halign>left</halign>
+        </text>
+	    <hrule>
+          <stretch>true</stretch>
+        </hrule>
+	  </group>
 
       <checkbox>
         <halign>left</halign>
-        <label>Particles (Smoke, Dust, Spray)</label>
+        <label>Particles (smoke, dust, spray)</label>
         <property>/sim/rendering/particles</property>
         <binding>
           <command>dialog-apply</command>
@@ -93,8 +126,10 @@
           <command>dialog-apply</command>
         </binding>
       </checkbox>
-
-      <checkbox>
+	  
+	  <!--
+	  
+	  <checkbox>
         <halign>left</halign>
         <label>Lightning</label>
         <property>/sim/rendering/lightning-enable</property>
@@ -103,15 +138,6 @@
         </binding>
       </checkbox>
 
-      <checkbox>
-        <halign>left</halign>
-        <label>Bump mapped clouds</label>
-        <property>/sim/rendering/bump-mapping</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </checkbox>
-
       <checkbox>
         <halign>left</halign>
         <label>Random objects</label>
@@ -129,44 +155,35 @@
           <command>dialog-apply</command>
         </binding>
       </checkbox>
-    </group>
-
-    <vrule/>
-
-    <group>
-      <layout>vbox</layout>
-
-      <text>
+	  
+	  -->
+	  
+	  <group>
+        <layout>hbox</layout>
+	    <text>
+          <label>Clouds</label>
+          <halign>left</halign>
+        </text>
+	    <hrule>
+          <stretch>true</stretch>
+        </hrule>
+	  </group>
+	  
+	  <!--
+	  
+	  <checkbox>
         <halign>left</halign>
-        <label>Shadows</label>
-      </text>
-
-      <checkbox>
-        <halign>left</halign>
-        <label>Enable</label>
-        <property>/sim/rendering/shadows/enabled</property>
+        <label>2D clouds</label>
+        <property>/sim/rendering/bump-mapping</property>
         <binding>
-            <command>dialog-apply</command>
+          <command>dialog-apply</command>
         </binding>
       </checkbox>
-      <checkbox>
-        <halign>left</halign>
-        <label>Debug</label>
-        <property>/sim/rendering/shadows/debug</property>
-        <binding>
-            <command>dialog-apply</command>
-        </binding>
-      </checkbox>
-
-      <hrule/>
-
-      <text>
-        <label>3D Clouds</label>
-        <halign>left</halign>
-      </text>
+	  
+	  -->
 
       <checkbox>
-        <label>Enable 3D clouds</label>
+        <label>3D clouds</label>
         <halign>left</halign>
         <property>/sim/rendering/clouds3d-enable</property>
         <binding>
@@ -213,17 +230,33 @@
           <property>/sim/rendering/clouds3d-vis-range</property>
         </text>
       </group>
+	  
+	  <group>
+	    <layout>vbox</layout>
+		<stretch>true</stretch>
+	  </group>
+	  
+    </group>
+	
+    <vrule/>
 
-      <hrule/>
+    <group>
+      <layout>vbox</layout>
 
-      <text>
-        <halign>left</halign>
-        <label>Shader Effects</label>
-      </text>
+      <group>
+        <layout>hbox</layout>
+	    <text>
+          <label>Shader effects</label>
+          <halign>left</halign>
+        </text>
+	    <hrule>
+          <stretch>true</stretch>
+        </hrule>
+	  </group>
 
       <checkbox>
         <halign>left</halign>
-        <label>Material Shaders</label>
+        <label>Material shaders</label>
         <property>/sim/rendering/shader-effects</property>
         <binding>
           <command>dialog-apply</command>
@@ -334,27 +367,6 @@
     </group>
   </group>
 
-  <hrule/>
-
-  <group>
-    <layout>hbox</layout>
-    <empty><stretch>true</stretch></empty>
-
-    <button>
-      <legend>Close</legend>
-      <default>true</default>
-      <key>Esc</key>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-      <binding>
-        <command>dialog-close</command>
-      </binding>
-    </button>
-
-    <empty><stretch>true</stretch></empty>
-  </group>
-
   <nasal>
     <open>
       gui.enable_widgets(cmdarg(), "shadows-debug", getprop("/sim/gui/devel-widgets"));