diff --git a/src/js/oseam-views-gauges.js b/src/js/oseam-views-gauges.js
index 6a93d2c..deaf3e2 100644
--- a/src/js/oseam-views-gauges.js
+++ b/src/js/oseam-views-gauges.js
@@ -105,8 +105,9 @@ OSeaM.views.Gauges = OSeaM.View.extend({
             this.layerGaugeVector
         ]);
         this.map.addControls([
+        	new OpenLayers.Control.PanZoomBar(),
+            new OpenLayers.Control.Navigation(),
             new OpenLayers.Control.Attribution(),
-            new OpenLayers.Control.KeyboardDefaults()
         ]);
         this.map.setCenter(new OpenLayers.LonLat(0.0, 40.0).transform(
             this.projectionWGS84,
diff --git a/src/js/templates/gauge.handlebars b/src/js/templates/gauge.handlebars
index 53c3d06..ac8bfb3 100644
--- a/src/js/templates/gauge.handlebars
+++ b/src/js/templates/gauge.handlebars
@@ -15,21 +15,21 @@
 <div class="control-group">
     <p><label class="tableft50">Latitude</label></p>
     <div class="input-append">
-        <input type="text" id="latitude" name="latitude" placeholder="52.0" value="{{lat}}"/>
+        <input type="text" id="latitude" name="latitude" placeholder="52.0" value="{{latitude}}"/>
         <span class="help-inline helpOsm"></span>
     </div>
 </div>
 <div class="control-group">
     <p><label class="tableft50">Longitude</label></p>
     <div class="input-append">
-        <input type="text" id="longitude" name="longitude" placeholder="1.0" value="{{lon}}"/>
+        <input type="text" id="longitude" name="longitude" placeholder="1.0" value="{{longitude}}"/>
         <span class="help-inline helpOsm"></span>
     </div>
 </div>
-<!--<div class="control-group">
-    <p><label class="tableft50">Pegelnullpunkt</label></p>
+<div class="control-group">
+    <p><label class="tableft50">Water Reference Level</label></p>
     <div class="input-append">
-        <input type="text" id="gaugezero" name="gaugezero" placeholder="230" value="{{gaugezero}}"/>
+        <input type="text" id="waterlevel" name="waterlevel" placeholder="230" value="{{waterlevel}}"/>
         <span class="help-inline helpOsm"></span>
     </div>
 </div>-->
diff --git a/src/js/templates/gaugedialog-en.handlebars b/src/js/templates/gaugedialog-en.handlebars
index 82f57ca..c0c9490 100644
--- a/src/js/templates/gaugedialog-en.handlebars
+++ b/src/js/templates/gaugedialog-en.handlebars
@@ -40,16 +40,16 @@
 					<span class="help-inline helpOsm"></span>
 	        	</div>
 	    	</div>
-	    	<div class="control-group"><p>
-	        <label class="tableft50" for="gaugeType">Gauge Type</label></p>
-			<div class="input-append">
-			<select id="gaugeType" name="gaugeType">
-			<option value="RIVER">River</option>
-			<option value="LAKE">Lake</option>
-			<option value="SEA">Sea</option>
-			<option value="UNDEFINED">Other</option>
-			</select>
-			</div>
+	    	<div class="control-group">
+	    		<p><label class="tableft50" for="gaugeType">Gauge Type</label></p>
+				<div class="input-append">
+					<select id="gaugeType" name="gaugeType">
+					<option value="RIVER">River</option>
+					<option value="LAKE">Lake</option>
+					<option value="SEA">Sea</option>
+					<option value="UNDEFINED">Other</option>
+					</select>
+				</div>
 		    </div>
 	    </div>
     </div>