diff --git a/examples/wfs-t.html b/examples/wfs-t.html
index df11340c34..1b410db3a7 100644
--- a/examples/wfs-t.html
+++ b/examples/wfs-t.html
@@ -1,85 +1,95 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <link rel="stylesheet" href="../theme/default/style.css" type="text/css" />
-    <link rel="stylesheet" href="style.css" type="text/css" />
+    <style type="text/css">
+        #map {
+            width: 800px;
+            height: 512px;
+            border: 1px solid black;
+        }
+    </style>
+    <script src="../lib/Firebug/firebug.js"></script>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        var map, layer;
+        var map, wfs;
+        OpenLayers.ProxyHost= "proxy.cgi?url=";
 
-        function init(){
+        function init() {
             map = new OpenLayers.Map('map');
-            layer = new OpenLayers.Layer.WMS( "State",
-                    "http://dev.openlayers.org/geoserver/wms", {layers: 'topp:tasmania_state_boundaries'} );
-            map.addLayer(layer);
-            layer = new OpenLayers.Layer.WMS( "Water",
-                    "http://dev.openlayers.org/geoserver/wms", {layers: 'topp:tasmania_water_bodies', 'transparent': true, format: 'image/gif' } );
-            map.addLayer(layer);
-            rlayer = new OpenLayers.Layer.WFS( "Roads",
-                    "http://dev.openlayers.org/geoserver/wfs", {typename: 'topp:tasmania_roads'},
-               {
-                      typename: 'tasmania_roads',
-                      featureNS: 'http://www.openplans.org/topp',
-                      extractAttributes: false
-               } );
-            rlayer.onFeatureInsert=function(feature) { feature.style.strokeColor = "#ff0000"; feature.layer.drawFeature(feature); }
-            map.addLayer(rlayer);
-            layer = new OpenLayers.Layer.WFS( "Cities",
-                    "http://dev.openlayers.org/geoserver/wfs", {typename: 'topp:tasmania_cities'},
-               {
-                      typename: 'tasmania_cities',
-                      featureNS: 'http://www.openplans.org/topp',
-                      extractAttributes: false
-               } );
-            map.addLayer(layer);
-            map.addControl(new OpenLayers.Control.LayerSwitcher());
-            var p = new OpenLayers.Control.Panel({'displayClass': 'olControlEditingToolbar'});
+            var wms = new OpenLayers.Layer.WMS(
+                "State",
+                "http://sigma.openplans.org/geoserver/wms",
+                {layers: 'topp:tasmania_state_boundaries'}
+            );
+            
+            wfs = new OpenLayers.Layer.WFS(
+                "Cities",
+                "http://sigma.openplans.org/geoserver/wfs",
+                {typename: 'topp:tasmania_cities'},
+                {
+                    typename: "tasmania_cities",
+                    featureNS: "http://www.openplans.org/topp",
+                    extractAttributes: false
+                }
+            );
+           
+            map.addLayers([wms, wfs]);
+
+            var panel = new OpenLayers.Control.Panel({
+                displayClass: "olControlEditingToolbar"
+            });
+
+            var dp = new OpenLayers.Control.DrawFeature(
+                wfs, OpenLayers.Handler.Point,
+                {
+                    handlerOptions: {freehand: false},
+                    displayClass: "olControlDrawFeaturePoint"
+                }
+            );
 
-            df = new OpenLayers.Control.DrawFeature(rlayer, OpenLayers.Handler.Path, {handlerOptions: {'freehand': false}, 'displayClass': 'olControlDrawFeaturePath'});
-            df.featureAdded = function(feature) {
-              feature.state = OpenLayers.State.INSERT;
-              feature.style['strokeColor'] = "#0000ff";
-              feature.layer.drawFeature(feature);
-            }
-            dp = new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Point, {handlerOptions: {'freehand': false}, 'displayClass': 'olControlDrawFeaturePoint'});
             dp.featureAdded = function(feature) {
-              var oldgeom = feature.geometry;
-              feature.layer.renderer.eraseGeometry(oldgeom);
-              feature.geometry = new OpenLayers.Geometry.MultiPoint(oldgeom);
-              feature.state = OpenLayers.State.INSERT;
-              feature.style['strokeColor'] = "#0000ff";
-              feature.layer.drawFeature(feature);
+                var oldgeom = feature.geometry;
+                feature.layer.renderer.eraseGeometry(oldgeom);
+                feature.geometry = new OpenLayers.Geometry.MultiPoint(oldgeom);
+                feature.state = OpenLayers.State.INSERT;   	                  
+                feature.layer.drawFeature(feature);
             }
-            p.addControls([ new OpenLayers.Control.Navigation(), df, dp ]);
+           
+            panel.addControls([
+                new OpenLayers.Control.Navigation(), dp
+            ]);
 
-            map.addControl(p);
+            map.addControl(panel);
+            
             map.zoomToExtent(new OpenLayers.Bounds(145.51045,-44.0,149.0,-40.5));
         }
+        
     </script>
-  </head>
-  <body onload="init()">
+</head>
+<body onload="init()">
 
-  <h1 id="title">WFS Example</h1>
+    <h1 id="title">WFS Example</h1>
+    
+    <div id="tags">
+    </div>
+    <p id="shortdesc">
+        Shows the use of the WFS layer type.
+    </p>
+    
+    <a href="#" onclick="OpenLayers.Console.log(wfs.commit());return false">Save Cities</a><br />
 
-  <div id="tags">
-  </div>
-  <p id="shortdesc">
-      Shows the use of the WFS layer type.
-  </p>
-
-    <a href="#" onclick="map.layers[2].commit();return false">Save Roads</a><br />
-    <a href="#" onclick="map.layers[3].commit();return false">Save Cities</a><br />
-    <div id="map" class="smallmap"></div>
-
-  <div id="docs">
-      This is an example of using a WFS layer type. Note that it requires a 
+    <div id="map"></div>
+    
+    <p id="docs">
+    This is an example of using a WFS layer type. Note that it requires a 
     working GeoServer install, which the OpenLayers project does not maintain;
     however, if you're interested, you should be able to point this against
     a default GeoServer setup without too much trouble.
-   </div>
+    </p>
 
 
 
-  </body>
+    </body>
 </html>
 
 
