diff --git a/js/menus/AssemblerSetupMenuView.js b/js/menus/AssemblerSetupMenuView.js
index 903a2a13dda1a7d5a37325448f399d5ebea9546f..2b363cc6e21319c23f5730e57e1d5313f14de2c6 100644
--- a/js/menus/AssemblerSetupMenuView.js
+++ b/js/menus/AssemblerSetupMenuView.js
@@ -9,7 +9,8 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'text!assemblerSet
     return MenuParentView.extend({
 
         events: {
-            "click .editMachineComponent":                          "_editMachineComponent"
+            "click .editMachineComponent":                          "_editMachineComponent",
+            "click .editMachineCode":                               "_editMachineCode"
         },
 
         _initialize: function(){
@@ -21,6 +22,11 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'text!assemblerSet
             this.model.set("currentNav", "navMachineComponent");
         },
 
+        _editMachineCode: function(e){
+            e.preventDefault();
+            console.log("edit code");
+        },
+
         _makeTemplateJSON: function(){
             return _.extend(this.model.toJSON(), cam.toJSON());
         },
diff --git a/js/menus/EditComponentMenuView.js b/js/menus/EditComponentMenuView.js
index 474d25013a9029c6080da71bb289a44e597fb525..0489c74fe611f38f7990ec37cff7a1cb8381864d 100644
--- a/js/menus/EditComponentMenuView.js
+++ b/js/menus/EditComponentMenuView.js
@@ -9,20 +9,44 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'text!editComponen
     return MenuParentView.extend({
 
         events: {
-            "click #exitComponentEdit":                                 "_exit"
+            "click #finishComponent":                                 "_save",
+            "click #cancelComponent":                                 "_cancel",
+            "click #deleteComponent":                                 "_delete",
+            "click #saveComponent":                                   "_saveToFile",
+            "click .removeChild":                                     "_removeChild"
         },
 
         _initialize: function(){
 
         },
 
-        _exit: function(e){
+        _save: function(e){
+            e.preventDefault();
+            console.log("save component");
+        },
+
+        _cancel: function(e){
             e.preventDefault();
             this.model.set("currentNav", "navAssemble");
         },
 
+        _delete: function(e){
+            e.preventDefault();
+            console.log("delete component");
+        },
+
+        _saveToFile: function(e){
+            e.preventDefault();
+            console.log("save component to file");
+        },
+
+        _removeChild: function(e){
+            e.preventDefault();
+            console.log("remove child");
+        },
+
         _makeTemplateJSON: function(){
-            return _.extend(this.model.toJSON(), cam.toJSON());
+            return _.extend(this.model.toJSON(), cam.toJSON(), {translation:{x:1, y:2, z:3}, scale:2, rotation:{x:0,y:90,z:127}});
         },
 
         template: _.template(template)
diff --git a/js/menus/templates/AssemblerSetupMenuView.html b/js/menus/templates/AssemblerSetupMenuView.html
index 027c26d87b813a7e5b9d749698e30bee5b79dee4..51a9cb9e162d64c28e84c05851c7032191878649 100644
--- a/js/menus/templates/AssemblerSetupMenuView.html
+++ b/js/menus/templates/AssemblerSetupMenuView.html
@@ -2,4 +2,9 @@ Parent/Child Tree:<br/><br/>
 Component 1 <a class="editMachineComponent" href="#">Edit</a><br/><br/>
 <a href="#" id="newMachineComponent" class=" btn btn-block btn-lg btn-default">+ New Machine Component</a><br/>
 Edit Code:<br/><br/>
+Header  <a class="editMachineCode" href="#">Edit</a><br/>
+Go Home <a class="editMachineCode" href="#">Edit</a><br/>
+Pick up stock <a class="editMachineCode" href="#">Edit</a><br/>
+Place part <a class="editMachineCode" href="#">Edit</a><br/>
+Footer <a class="editMachineCode" href="#">Edit</a><br/><br/>
 <a href="#" id="saveMachineToFiles" class=" btn btn-block btn-lg btn-success">Save Machine Files</a><br/>
diff --git a/js/menus/templates/EditComponentMenuView.html b/js/menus/templates/EditComponentMenuView.html
index 0caececa56dbb8f242d82736563e94a326d8aa88..d34085d211f8ed46e213592a6eea0ce385ef8bf7 100644
--- a/js/menus/templates/EditComponentMenuView.html
+++ b/js/menus/templates/EditComponentMenuView.html
@@ -1,2 +1,33 @@
-<a href="#" id="exitComponentEdit" class=" btn btn-block btn-lg btn-default">Cancel / Exit</a><br/>
-
+Parent: &nbsp;&nbsp;
+    <div class="btn-group">
+        <button data-toggle="dropdown" class="btn dropdown-toggle" type="button">my parent<span class="caret"></span></button>
+        <ul role="menu" class="dropdown-menu">
+            <li><a class="component dropdownSelector" data-property="parent" data-value="thing" href="#">thing 1</a></li>
+            <li><a class="component dropdownSelector" data-property="parent" data-value="thing" href="#">thing 2</a></li>
+        </ul>
+    </div><br/><br/>
+Children: &nbsp;&nbsp;
+<div class="btn-group">
+    <button data-toggle="dropdown" class="btn dropdown-toggle" type="button">+ Add Child<span class="caret"></span></button>
+    <ul role="menu" class="dropdown-menu">
+        <li><a class="component dropdownSelector" data-property="parent" data-value="thing" href="#">thing 1</a></li>
+        <li><a class="component dropdownSelector" data-property="parent" data-value="thing" href="#">thing 2</a></li>
+    </ul>
+</div><br/>
+    child 1 <a href="#" class="removeChild">Remove Child</a><br/>
+    child 2 <a href="#" class="removeChild">Remove Child</a><br/><br/>
+STL: &nbsp;&nbsp;STL Name<br/><br/>
+<a id="uploadStl" href="#" class="btn btn-block btn-lg btn-default">Upload STL</a><br/>
+Offset (xyz):&nbsp;&nbsp;
+    <input data-property="translation" data-key="x" value="<%= translation.x %>" placeholder="X" class="form-control floatInput component" type="text">&nbsp;
+    <input data-property="translation" data-key="y" value="<%= translation.y %>" placeholder="Y" class="form-control floatInput component" type="text">&nbsp;
+    <input data-property="translation" data-key="z" value="<%= translation.z %>" placeholder="Z" class="form-control floatInput component" type="text"><br/><br/>
+Rotation (xyz):&nbsp;&nbsp;
+    <input data-property="rotation" data-key="x" value="<%= rotation.x %>" placeholder="X" class="form-control floatInput component" type="text">&nbsp;
+    <input data-property="rotation" data-key="y" value="<%= rotation.y %>" placeholder="Y" class="form-control floatInput component" type="text">&nbsp;
+    <input data-property="rotation" data-key="z" value="<%= rotation.z %>" placeholder="Z" class="form-control floatInput component" type="text"><br/><br/>
+Scale: &nbsp;&nbsp;<input data-property="scale" value="<%= scale %>" placeholder="Scale" class="form-control floatInput component" type="text"><br/><br/>
+<a id="finishComponent" href="#" class="btn btn-block btn-lg btn-success">Save Component</a><br/>
+<a id="cancelComponent" href="#" class="btn btn-halfWidth btn-lg btn-default">Cancel / Exit</a>
+<a id="deleteComponent" href="#" class="btn btn-halfWidth pull-right btn-lg btn-default"><span class="fui-trash"></span> Delete</a><br/><br/>
+<a id="saveComponent" href="#" class="btn btn-block btn-lg pull-right btn-default">Save Component To File</a><br/><br/>
\ No newline at end of file