diff --git a/css/main.css b/css/main.css
index 19eaa471ee52868ef9f0c283332d1a39f66b5db2..e51bab1119a48db2a47c7a78688278e7bfae7d6e 100644
--- a/css/main.css
+++ b/css/main.css
@@ -186,7 +186,7 @@ hr {
 input.intInput, input.floatInput{
     width:22%;
     display: inline;
-    padding: 8px 10px;
+    padding: 8px 8px;
 }
 
 .dropdown-menu, .select2-drop {
diff --git a/js/cam/Machine.js b/js/cam/Machine.js
index 59f0596f262ed7157d58821092a61351c663ed60..701f76cc155caeae321fd7c75253f3ae20ac46c7 100644
--- a/js/cam/Machine.js
+++ b/js/cam/Machine.js
@@ -28,7 +28,8 @@ Machine.prototype._setDefaults = function(){
     globals.cam.set("stockFixed", false);
     globals.cam.set("originPosition", {x:0,y:0,z:0});
     var boundingBox = globals.lattice.calculateBoundingBox();
-    globals.cam.set("rapidHeight", boundingBox.max.z + 2*globals.lattice.zScale());
+    var rapidHeight = (boundingBox.max.z + 2*globals.lattice.zScale()).toFixed(4);
+    globals.cam.set("rapidHeight", rapidHeight);
     globals.cam.set("stockPosition", {x:0,y:0,z:0});
     globals.cam.set("stockSeparation", globals.lattice.xScale());
 };
@@ -268,7 +269,8 @@ Shopbot.prototype._setDefaults = function(){
     Machine.prototype._setDefaults.call(this);
     globals.cam.set("camProcess", "shopbot");
     var boundingBox = globals.lattice.calculateBoundingBox();
-    globals.cam.set("stockPosition", {x:0,y:boundingBox.max.y + 3*globals.lattice.yScale(),z:0});
+    var yPos = (boundingBox.max.y + 3*globals.lattice.yScale()).toFixed(4);
+    globals.cam.set("stockPosition", {x:0,y:yPos,z:0});
 };
 
 Shopbot.prototype._buildMeshes = function(callback){
@@ -307,7 +309,8 @@ God.prototype = Object.create(Machine.prototype);
 God.prototype._setDefaults = function(){
     Machine.prototype._setDefaults.call(this);
     var boundingBox = globals.lattice.calculateBoundingBox();
-    globals.cam.set("stockPosition", {x:0,y:0,z:boundingBox.max.z + 5*globals.lattice.zScale()});
+    var zPos = (boundingBox.max.z + 5*globals.lattice.zScale()).toFixed(4);
+    globals.cam.set("stockPosition", {x:0,y:0,z:zPos});
 };
 
 God.prototype._buildMeshes = function(callback){
diff --git a/js/cam/MachineOneBit.js b/js/cam/MachineOneBit.js
index 4b7195923ae0ed0088bf34e60af95e9d05cc4d95..cd30f1850b1ae252937034cd1a1a008d8919c10e 100644
--- a/js/cam/MachineOneBit.js
+++ b/js/cam/MachineOneBit.js
@@ -11,8 +11,9 @@ OneBitBot.prototype._setDefaults = function(){
     Machine.prototype._setDefaults.call(this);
     globals.cam.set("stockFixed", true);
     var scale = globals.lattice.get("scale");
-    globals.cam.set("stockPosition", {x:1.11*scale,y:0,z:1.14*scale});
-    globals.cam.set("rapidHeight", 2*scale);
+    var xPos = (1.11*scale).toFixed(4);
+    var zPos = (1.14*scale).toFixed(4);
+    globals.cam.set("stockPosition", {x:xPos,y:0,z:zPos});
 };
 
 OneBitBot.prototype.setMachinePosition = function(){
diff --git a/js/cam/cam.js b/js/cam/cam.js
index 397fa43381236bba550e7275f49d6512ce409ee8..ae113ac385b9e72c90bc9c3f61ee7690d70877ff 100644
--- a/js/cam/cam.js
+++ b/js/cam/cam.js
@@ -166,8 +166,6 @@ Cam = Backbone.Model.extend({
     },
 
     _updateStockPosToOrigin: function(newOrigin, lastOrigin){
-        console.log(newOrigin);
-        console.log(lastOrigin);
         var newStockPosition = _.clone(this.get("stockPosition"));
         _.each(_.keys(newStockPosition), function(key){
             newStockPosition[key] += newOrigin[key] - lastOrigin[key];
diff --git a/js/menus/CamMenuView.js b/js/menus/CamMenuView.js
index 2d3fe1838c567dd5ba4b143b9ae7f04c169cad46..f3c3d537e783a9b645a11b7b94f9e51546c654d9 100644
--- a/js/menus/CamMenuView.js
+++ b/js/menus/CamMenuView.js
@@ -71,15 +71,15 @@ CamMenuView = Backbone.View.extend({
                     <% }); %>\
                 </ul>\
             </div><br/><br/>\
-            Origin (xyz): &nbsp;&nbsp;<input data-property="originPosition" data-key="x" value="<%= originPosition.x.toFixed(4) %>" placeholder="X" class="form-control floatInput assembler" type="text">\
-            &nbsp;<input data-property="originPosition" data-key="y" value="<%= originPosition.y.toFixed(4) %>" placeholder="Y" class="form-control floatInput assembler" type="text">\
-            &nbsp;<input data-property="originPosition" data-key="z" value="<%= originPosition.z.toFixed(4) %>" placeholder="Z" class="form-control floatInput assembler" type="text">\
+            Origin (xyz): &nbsp;&nbsp;<input data-property="originPosition" data-key="x" value="<%= originPosition.x %>" placeholder="X" class="form-control floatInput assembler" type="text">\
+            &nbsp;<input data-property="originPosition" data-key="y" value="<%= originPosition.y %>" placeholder="Y" class="form-control floatInput assembler" type="text">\
+            &nbsp;<input data-property="originPosition" data-key="z" value="<%= originPosition.z %>" placeholder="Z" class="form-control floatInput assembler" type="text">\
             <% if (!(machineName == "handOfGod")){ %>\
             <br/><a id="manualSelectOrigin" class=" btn btn-lg btn-default btn-imageCustom<% if (manualSelectOrigin){ %> btn-selected<% } %>"><img src="assets/imgs/cursor.png"></a>\
             <label>&nbsp;&nbsp;&nbsp;Manually select origin from existing cell</label><br/><br/>\
-            Stock (xyz): &nbsp;&nbsp;<input data-property="stockPosition" data-key="x" value="<%= stockPosition.x.toFixed(4) %>" placeholder="X" class="form-control floatInput assembler" type="text">\
-            &nbsp;<input data-property="stockPosition" data-key="y" value="<%= stockPosition.y.toFixed(4) %>" placeholder="Y" class="form-control floatInput assembler" type="text">\
-            &nbsp;<input data-property="stockPosition" data-key="z" value="<%= stockPosition.z.toFixed(4) %>" placeholder="Z" class="form-control floatInput assembler" type="text"><br/>\
+            Stock (xyz): &nbsp;&nbsp;<input data-property="stockPosition" data-key="x" value="<%= stockPosition.x %>" placeholder="X" class="form-control floatInput assembler" type="text">\
+            &nbsp;<input data-property="stockPosition" data-key="y" value="<%= stockPosition.y %>" placeholder="Y" class="form-control floatInput assembler" type="text">\
+            &nbsp;<input data-property="stockPosition" data-key="z" value="<%= stockPosition.z %>" placeholder="Z" class="form-control floatInput assembler" type="text"><br/>\
             <label class="checkbox" for="stockPosRel">\
             <input id="stockPosRel" data-property="stockPositionRelative" type="checkbox" <% if (stockPositionRelative){ %> checked="checked"<% } %> value="" data-toggle="checkbox" class="assembler custom-checkbox">\
             <span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>\
@@ -97,13 +97,13 @@ CamMenuView = Backbone.View.extend({
                 &nbsp;<input data-property="stockArraySize" data-key="y" value="<%= stockArraySize.y %>" placeholder="Y" class="form-control intInput assembler" type="text"><br/><br/>\
                 Stock separation: &nbsp;&nbsp;<input data-property="stockSeparation" value="<%= stockSeparation %>" placeholder="X" class="form-control floatInput assembler" type="text"><br/><br/>\
             <% } %>\
-            Clearance Height: &nbsp;&nbsp;<input data-property="rapidHeight" value="<%= rapidHeight.toFixed(4) %>" placeholder="Z" class="form-control floatInput assembler" type="text"><br/>\
+            Clearance Height: &nbsp;&nbsp;<input data-property="rapidHeight" value="<%= rapidHeight %>" placeholder="Z" class="form-control floatInput assembler" type="text"><br/>\
             <label class="checkbox" for="rapidPosRel">\
             <input id="rapidPosRel" data-property="rapidHeightRelative" type="checkbox" <% if (rapidHeightRelative){ %> checked="checked"<% } %> value="" data-toggle="checkbox" class="assembler custom-checkbox">\
             <span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>\
             Clearance height relative to Origin</label>\
             <% } else { %>\
-            <br/><br/>Stock Height: &nbsp;&nbsp;<input data-property="stockPosition" data-key="z" value="<%= stockPosition.z.toFixed(4) %>" placeholder="Z" class="form-control floatInput assembler" type="text"><br/><br/>\
+            <br/><br/>Stock Height: &nbsp;&nbsp;<input data-property="stockPosition" data-key="z" value="<%= stockPosition.z %>" placeholder="Z" class="form-control floatInput assembler" type="text"><br/><br/>\
             <% } %>\
             Approach Height: &nbsp;&nbsp;<input data-property="safeHeight" value="<%= safeHeight %>" placeholder="Z" class="form-control floatInput assembler" type="text"><br/><br/>\
             Speeds (measured in <%= units %> per second):<br/><br/>\
diff --git a/js/menus/MenuWrapperView.js b/js/menus/MenuWrapperView.js
index f580fe10bba7e816bebec2dc770330c60b48ec7e..92cfd1c753f1b5ef64b3f2ed57c459bc3dbc3b3f 100644
--- a/js/menus/MenuWrapperView.js
+++ b/js/menus/MenuWrapperView.js
@@ -79,6 +79,10 @@ MenuWrapper = Backbone.View.extend({
             newVal = parseFloat((newVal - globals.cam.get("originPosition")["z"]).toFixed(4));
         }
 
+        //remove trailing zeros
+        newVal = newVal.toString();
+        newVal = parseFloat(newVal);
+
         if (key){
             if ($target.hasClass("lattice")) {
                 globals.lattice.get(property)[key] = newVal;