diff --git a/controller.js b/controller.js
index e51803b..d88e86e 100644
--- a/controller.js
+++ b/controller.js
@@ -12,6 +12,13 @@ var Controller = function() {
         return this.object[this.propertyName];
     }
     
+	this.makeUnselectable = function(elem) {
+		elem.onselectstart = function() { return false; };
+		elem.style.MozUserSelect = "none";
+		elem.style.KhtmlUserSelect = "none";
+		elem.unselectable = "on";
+	}
+    
     this.domElement = document.createElement('div');
     this.domElement.setAttribute('class', 'guidat-controller ' + this.type);
 
@@ -23,12 +30,6 @@ var Controller = function() {
     this.setName(this.propertyName);
     this.domElement.appendChild(this.propertyNameElement);
     
-    makeUnselectable(this.domElement);
+    this.makeUnselectable(this.domElement);
     
-	function makeUnselectable(elem) {
-		elem.onselectstart = function() { return false; };
-		elem.style.MozUserSelect = "none";
-		elem.style.KhtmlUserSelect = "none";
-		elem.unselectable = "on";
-	}
 };
\ No newline at end of file
diff --git a/controller.number.js b/controller.number.js
index 12f0ad1..d63d490 100644
--- a/controller.number.js
+++ b/controller.number.js
@@ -80,7 +80,11 @@ var NumberController = function() {
         } else if(isDragged) {
             if(inc != slider.value) inc = slider.value;
         }
+<<<<<<< HEAD
         updateValue(inc);
+=======
+        return false;
+>>>>>>> b8323ce896a851bbe5a18e17bff36a5bdaa97db1
     }, false);
     
     function updateValue(val) {
diff --git a/gui.css b/gui.css
index 95dd873..036d9ed 100644
--- a/gui.css
+++ b/gui.css
@@ -78,6 +78,7 @@
 }
 .guidat-controller.number input[type=number] {
 	width: 45px;
+	cursor: ns-resize;
 }
 
 .guidat-controller.boolean input {