diff --git a/js/cam/assemblers/Assembler.js b/js/cam/assemblers/Assembler.js
index 9e6e7f19509fecd012ab6d795c5b0ab8e08363eb..232478be8fd93aed33798239ddfef4f81af849d7 100644
--- a/js/cam/assemblers/Assembler.js
+++ b/js/cam/assemblers/Assembler.js
@@ -163,6 +163,12 @@ Assembler.prototype.releaseStock = function(index){
 Assembler.prototype.pause = function(){
 };
 
+Assembler.prototype.moveMachine = function(){
+    var origin = globals.cam.get("originPosition");
+    this.object3D.position.set(origin.x, origin.y, origin.z);
+    globals.three.render();
+};
+
 Assembler.prototype.moveTo = function(x, y, z, speed, wcs, callback){
     x = this._makeAbsPosition(x, wcs.x);
     y = this._makeAbsPosition(y, wcs.y);
diff --git a/js/cam/assemblers/StaplerAssembler.js b/js/cam/assemblers/StaplerAssembler.js
index 3765debb77180069f527c9319e44e2a7b40ab178..96fa4ad66ea44982291800e6ce18bebe670c2226 100644
--- a/js/cam/assemblers/StaplerAssembler.js
+++ b/js/cam/assemblers/StaplerAssembler.js
@@ -31,7 +31,7 @@ StaplerAssembler.prototype._loadSTls = function(doAdd){
 
     function geometryScale(geometry){
         geometry.applyMatrix(new THREE.Matrix4().makeTranslation(0.125, -2.3883, 1.0348));
-        geometry.applyMatrix(new THREE.Matrix4().makeTranslation(0, 0.0625, -0.025));
+        geometry.applyMatrix(new THREE.Matrix4().makeTranslation(0.075, 0.0375, 0));
         geometry.applyMatrix(new THREE.Matrix4().makeRotationX(Math.PI/2));
 
         var unitScale = 20;
diff --git a/js/cam/cam.js b/js/cam/cam.js
index 32ad206245ccd240cb0040c4db724e208784e430..3d3d69ca787cf2eb6c7f735b9d0b1a7af727c851 100644
--- a/js/cam/cam.js
+++ b/js/cam/cam.js
@@ -164,7 +164,6 @@ Cam = Backbone.Model.extend({
         globals.three.sceneAdd(stock);
         this.set("stock", stock);
         this._moveStock();
-        this._setCAMScale();
         this._setCAMVisibility();
     },
 
@@ -173,14 +172,12 @@ Cam = Backbone.Model.extend({
 //        this.get("origin").position.set(position.x, position.y, position.z);
         if (this.get("stockFixed")) this._updateStockPosToOrigin(position, this.previous("originPosition"));
         globals.three.render();
-        if (this.get("assembler") && this.get("assembler").setMachinePosition) this.get("assembler").setMachinePosition();
+        if (this.get("assembler")) this.get("assembler").moveMachine();
     },
 
     _updateStockPosToOrigin: function(newOrigin, lastOrigin){
         var newStockPosition = _.clone(this.get("stockPosition"));
-        console.log(newStockPosition);
         _.each(_.keys(newStockPosition), function(key){
-            console.log(key);
             newStockPosition[key] += newOrigin[key] - lastOrigin[key];
             newStockPosition[key] = parseFloat(newStockPosition[key].toFixed(4));
         });
diff --git a/js/models/AppState.js b/js/models/AppState.js
index 2d620fc5af9c9735acda266320aa3a49790a3a43..f30381348316ca97d5d8ce9e33f4edd4d186a9f5 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -97,6 +97,7 @@ AppState = Backbone.Model.extend({
         if (navSelection == "navDesign") {
             this.set("currentTab", this.get("lastDesignTab"));
             this.set("basePlaneIsVisible", true);
+            this.set("highlighterIsVisible", true);
         }
         else if (navSelection == "navSim") {
             this.set("currentTab", this.get("lastSimulationTab"));