diff --git a/examples/getfeatureinfo-control.html b/examples/getfeatureinfo-control.html
index 281cffdc10..c6e9024c43 100644
--- a/examples/getfeatureinfo-control.html
+++ b/examples/getfeatureinfo-control.html
@@ -7,98 +7,83 @@
     <style type="text/css">
         ul, li { padding-left: 0px; margin-left: 0px; }
     </style>
-  </head>
-  <body>
-      <h1 id="title">Feature Info Example</h1>
-
-      <div id="tags"></div>
-
-      <p id="shortdesc">
-        Demonstrates the WMSGetFeatureInfo control for fetching information about a position from WMS.
-      </p>
-
-    <a id="permalink" href="">Permalink</a><br />
-
-    <div style="float:right;width:28%">
-        <h1 style="font-size:1.3em;">South Africa</h1>
-        <p style="font-size:.8em;">Click on the map to get feature info.</p>
-        <div id="nodeList">
-        </div>
-    </div>
-      <div id="map" class="smallmap"></div>
-
   <script defer="defer" type="text/javascript">
-    OpenLayers.ProxyHost = "/dev/examples/proxy.cgi?url=";
-    var map = new OpenLayers.Map('map', {
-        maxExtent: new OpenLayers.Bounds(16.154,-34.953,33.327,-22.193)
-    });
+    OpenLayers.ProxyHost = "/cgi-bin/proxy.cgi?url=";
+    
+    var map, infocontrols, vegetation, highlightlayer;
+    
+    function load() {
+        map = new OpenLayers.Map('map', {
+            maxExtent: new OpenLayers.Bounds(16.154,-34.953,33.327,-22.193)
+        });
 
-    var roads = new OpenLayers.Layer.WMS("Roads",
-        "http://geo.openplans.org/geoserver/wms", 
-        {'layers': 'za:za_roads', transparent: true, format: 'image/png'},
-        {isBaseLayer: true}
-    );
+        var roads = new OpenLayers.Layer.WMS("Roads",
+            "http://geo.openplans.org/geoserver/wms", 
+            {'layers': 'za:za_roads', transparent: true, format: 'image/png'},
+            {isBaseLayer: true}
+        );
 
-    var natural = new OpenLayers.Layer.WMS("Natural Features",
-        "http://geo.openplans.org/geoserver/wms", 
-        {'layers': 'za:za_natural', transparent: true, format: 'image/png'},
-        {isBaseLayer: false}
-    );
+        var natural = new OpenLayers.Layer.WMS("Natural Features",
+            "http://geo.openplans.org/geoserver/wms", 
+            {'layers': 'za:za_natural', transparent: true, format: 'image/png'},
+            {isBaseLayer: false}
+        );
 
-    var points = new OpenLayers.Layer.WMS("Points of Interest",
-        "http://geo.openplans.org/geoserver/wms", 
-        {'layers': 'za:za_points', transparent: true, format: 'image/png'},
-        {isBaseLayer: false}
-    );
+        var points = new OpenLayers.Layer.WMS("Points of Interest",
+            "http://geo.openplans.org/geoserver/wms", 
+            {'layers': 'za:za_points', transparent: true, format: 'image/png'},
+            {isBaseLayer: false}
+        );
 
-    var vegetation = new OpenLayers.Layer.WMS("Vegetation",
-        "http://geo.openplans.org/geoserver/wms", 
-        {'layers': 'za:za_vegetation', transparent: true, format: 'image/png'},
-        {isBaseLayer: false}
-    );
+        vegetation = new OpenLayers.Layer.WMS("Vegetation",
+            "http://geo.openplans.org/geoserver/wms", 
+            {'layers': 'za:za_vegetation', transparent: true, format: 'image/png'},
+            {isBaseLayer: false}
+        );
 
-    var highlightLayer = new OpenLayers.Layer.Vector("Highlighted Features", {
-        displayInLayerSwitcher: false, 
-        isBaseLayer: false, 
-        styleMap: new OpenLayers.StyleMap({
-           "default": new OpenLayers.Style({
-               fillColor: "#0000BB",
-               strokeColor: "#000099"
-           })
-        })
+        highlightLayer = new OpenLayers.Layer.Vector("Highlighted Features", {
+            displayInLayerSwitcher: false, 
+            isBaseLayer: false, 
+            styleMap: new OpenLayers.StyleMap({
+               "default": new OpenLayers.Style({
+                   fillColor: "#0000BB",
+                   strokeColor: "#000099"
+               })
+            })
+            }
+        );
+
+        infoControls = {
+            click: new OpenLayers.Control.WMSGetFeatureInfo('http://geo.openplans.org/geoserver/wms', {
+                title: 'Identify features by clicking',
+                layers: [vegetation],
+                queryVisible: true
+            }),
+            hover: new OpenLayers.Control.WMSGetFeatureInfo('http://geo.openplans.org/geoserver/wms', {
+                title: 'Identify features by clicking',
+                layers: [vegetation],
+                hover: true,
+                // defining a custom format here
+                formats: {'application/vnd.ogc.gml': new OpenLayers.Format.GML({
+                    typeName: 'vegetation', 
+                    featureNS: 'http://opengeo.org/za'
+                })},
+                queryVisible: true
+            })
         }
-    );
 
-    var infoControls = {
-        click: new OpenLayers.Control.WMSGetFeatureInfo('http://geo.openplans.org/geoserver/wms', {
-            title: 'Identify features by clicking',
-            layers: [vegetation],
-            queryVisible: true
-        }),
-        hover: new OpenLayers.Control.WMSGetFeatureInfo('http://geo.openplans.org/geoserver/wms', {
-            title: 'Identify features by clicking',
-            layers: [vegetation],
-            hover: true,
-            // defining a custom format here
-            formats: {'application/vnd.ogc.gml': new OpenLayers.Format.GML({
-                typeName: 'vegetation', 
-                featureNS: 'http://opengeo.org/za'
-            })},
-            queryVisible: true
-        })
+        map.addLayers([roads, natural, points, vegetation, highlightLayer]); 
+        for (var i in infoControls) { 
+            infoControls[i].events.register("getfeatureinfo", this, showInfo);
+            map.addControl(infoControls[i]); 
+        }
+
+        map.addControl(new OpenLayers.Control.LayerSwitcher());
+
+        infoControls.click.activate();
+        map.zoomToMaxExtent();
     }
 
-    map.addLayers([roads, natural, points, vegetation, highlightLayer]); 
-    for (var i in infoControls) { 
-        infoControls[i].events.register("getfeatureinfo", this, showInfo);
-        map.addControl(infoControls[i]); 
-    }
-
-    map.addControl(new OpenLayers.Control.LayerSwitcher());
-
-    infoControls.click.activate();
-    map.zoomToMaxExtent();
-
     function showInfo(evt) {
         if (evt.features && evt.features.length) {
              highlightLayer.destroyFeatures();
@@ -140,6 +125,26 @@
 
     // function toggle(key
   </script>
+  </head>
+  <body onload="load()">
+      <h1 id="title">Feature Info Example</h1>
+
+      <div id="tags"></div>
+
+      <p id="shortdesc">
+        Demonstrates the WMSGetFeatureInfo control for fetching information about a position from WMS.
+      </p>
+
+    <a id="permalink" href="">Permalink</a><br />
+
+    <div style="float:right;width:28%">
+        <h1 style="font-size:1.3em;">South Africa</h1>
+        <p style="font-size:.8em;">Click on the map to get feature info.</p>
+        <div id="nodeList">
+        </div>
+    </div>
+      <div id="map" class="smallmap"></div>
+
     <div id="docs">
     </div>
         <ul id="control">
