diff --git a/js/cam/Cam.js b/js/cam/Cam.js
index bc9471016cccd33aba8c1a22c66794f06e18e9c8..64fd5037c89c51923aa8832256d14901854d8595 100644
--- a/js/cam/Cam.js
+++ b/js/cam/Cam.js
@@ -179,6 +179,7 @@ define(['underscore', 'three', 'backbone', 'appState', 'latticeCAM', 'threeModel
 
         _setCAMVisibility: function(){
             var visible = this.isVisible();
+            console.log(visible);
     //        this.get("origin").visible = visible;
     //        this.get("stock").visible = visible;
             if (visible && !this.get("assembler")) this.selectMachine();
@@ -216,7 +217,7 @@ define(['underscore', 'three', 'backbone', 'appState', 'latticeCAM', 'threeModel
         isVisible: function(){
             var currentTab = appState.get("currentTab");
             var currentNav = appState.get("currentNav");
-            return (currentTab == "assemblerSetup" || currentTab == "cam" || currentTab == "animate" || currentNav == "navComm"
+            return (currentTab == "assemblerSetup" || currentTab == "cam" || currentTab == "animation" || currentNav == "navComm"
                 || currentTab == "editComponent");
         },
 
diff --git a/js/cells/DMACell.js b/js/cells/DMACell.js
index 070de4858506198f913be2ed56715377b526bb15..d533bfc56e11a4ddb8f896eb0e88315dc7ade813 100644
--- a/js/cells/DMACell.js
+++ b/js/cells/DMACell.js
@@ -259,7 +259,7 @@ define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'globals', '
         var transparent = evalFunction(this);
         if (transparent == this.isTransparent) return;
         this.isTransparent = transparent;
-        this.setMaterial(this.getMaterial(true));
+        this._setTHREEMaterial(this.getMaterial(true));
         this.setWireframeVisibility(!this.isTransparent);
         if (this.parts) {
             _.each(this.parts, function(part){
diff --git a/js/materials/DMAMaterials.js b/js/materials/DMAMaterials.js
index fce8698ad2a3a32aebe86ba153abbaf4d7614d9e..c844d3cbf3c1818ab2d6feeb310ceb123a8ff20b 100644
--- a/js/materials/DMAMaterials.js
+++ b/js/materials/DMAMaterials.js
@@ -159,7 +159,7 @@ define(['underscore', 'three', 'appState', 'lattice', 'materialsPlist', 'threeMo
         loopCells(cells, function(cell){
             if (!cell) return;
             var isComposite = _isComposite(cell.getMaterialID());
-            if ((elementaryTypes && !isComposite) || (!elementaryTypes && isComposite)) children.push(cell.materialID);
+            if ((elementaryTypes && !isComposite) || (!elementaryTypes && isComposite)) children.push(cell.getMaterialID());
             if (isComposite){
                 if (elementaryTypes && materialsList[cell.materialID].elementaryChildren) {
                     Array.prototype.push.apply(children, materialsList[cell.materialID].elementaryChildren);
diff --git a/js/menus/templates/Ribbon.html b/js/menus/templates/Ribbon.html
index 6ce50d483f94664b0e575071f8dae4379b2a7b24..06537a8e1be79a84e4f86ac3db1c5952fc95d0c2 100644
--- a/js/menus/templates/Ribbon.html
+++ b/js/menus/templates/Ribbon.html
@@ -12,7 +12,6 @@
         <% }else{ %>
             <a class="btn btn-primary btn-ribbon ribbonDeleteMode<% if (deleteMode){ %> ribbon-selected"<% } %>"><span class="fui-cross"></span></a>
         <% } %>
-        <a id="ribbonAxesToggle" class="btn btn-primary btn-ribbon <% if (axesAreVisible){ %> ribbon-selected"<% } %>">Axes</a>
     </div>
 </div>
 <!--//<a class="btn btn-primary btn-ribbon highlightMode<% if (highlightMode){ %> ribbon-selected<% } %>" href="#"><img data-type="part" src="assets/imgs/cursor-light.png"></a>-->