diff --git a/js/main.js b/js/main.js
index d9dc5cc33cbd9447c209f990962215ba9686b5dd..5b27c471e8442a0d36805d8270f6afaffc79e2b1 100644
--- a/js/main.js
+++ b/js/main.js
@@ -128,6 +128,7 @@ require.config({
         mStaticMenu: 'menus/MStaticMenuView',
         mDynamicMenu: 'menus/MDynamicMenuView',
         assemblerSetupMenu: 'menus/AssemblerSetupMenuView',
+        editComponentMenu: 'menus/EditComponentMenuView',
 
         //templates
         navViewMenuTemplate: 'menus/templates/NavViewMenu.html',
@@ -156,6 +157,7 @@ require.config({
         mStaticMenuTemplate: 'menus/templates/MStaticMenuView.html',
         mDynamicMenuTemplate: 'menus/templates/MDynamicMenuView.html',
         assemblerSetupMenuTemplate: 'menus/templates/AssemblerSetupMenuView.html',
+        editComponentMenuTemplate: 'menus/templates/EditComponentMenuView.html',
 
         //electronic sim
         eSimPlist: 'plists/ESimPlist',
diff --git a/js/menus/AssemblerSetupMenuView.js b/js/menus/AssemblerSetupMenuView.js
index 3d5028f4112881fd024a9b15a162ea49a739a815..903a2a13dda1a7d5a37325448f399d5ebea9546f 100644
--- a/js/menus/AssemblerSetupMenuView.js
+++ b/js/menus/AssemblerSetupMenuView.js
@@ -9,12 +9,18 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'text!assemblerSet
     return MenuParentView.extend({
 
         events: {
+            "click .editMachineComponent":                          "_editMachineComponent"
         },
 
         _initialize: function(){
 
         },
 
+        _editMachineComponent: function(e){
+            e.preventDefault();
+            this.model.set("currentNav", "navMachineComponent");
+        },
+
         _makeTemplateJSON: function(){
             return _.extend(this.model.toJSON(), cam.toJSON());
         },
diff --git a/js/menus/EditComponentMenuView.js b/js/menus/EditComponentMenuView.js
new file mode 100644
index 0000000000000000000000000000000000000000..474d25013a9029c6080da71bb289a44e597fb525
--- /dev/null
+++ b/js/menus/EditComponentMenuView.js
@@ -0,0 +1,30 @@
+/**
+ * Created by aghassaei on 8/12/15.
+ */
+
+
+define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'text!editComponentMenuTemplate'],
+    function($, _, MenuParentView, plist, cam, template){
+
+    return MenuParentView.extend({
+
+        events: {
+            "click #exitComponentEdit":                                 "_exit"
+        },
+
+        _initialize: function(){
+
+        },
+
+        _exit: function(e){
+            e.preventDefault();
+            this.model.set("currentNav", "navAssemble");
+        },
+
+        _makeTemplateJSON: function(){
+            return _.extend(this.model.toJSON(), cam.toJSON());
+        },
+
+        template: _.template(template)
+    });
+});
\ No newline at end of file
diff --git a/js/menus/templates/AssemblerSetupMenuView.html b/js/menus/templates/AssemblerSetupMenuView.html
index 939d97eff9b681d96797e7a53b8f8b4c01cfae13..027c26d87b813a7e5b9d749698e30bee5b79dee4 100644
--- a/js/menus/templates/AssemblerSetupMenuView.html
+++ b/js/menus/templates/AssemblerSetupMenuView.html
@@ -1 +1,5 @@
-Assembler Setup
\ No newline at end of file
+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/>
+<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
new file mode 100644
index 0000000000000000000000000000000000000000..0caececa56dbb8f242d82736563e94a326d8aa88
--- /dev/null
+++ b/js/menus/templates/EditComponentMenuView.html
@@ -0,0 +1,2 @@
+<a href="#" id="exitComponentEdit" class=" btn btn-block btn-lg btn-default">Cancel / Exit</a><br/>
+
diff --git a/js/plists/PList.js b/js/plists/PList.js
index 08828855a52ce88d37faf8dc030d73d7dee4f608..ebc047bb2aca04a53e1f17879cab21d7357253f8 100644
--- a/js/plists/PList.js
+++ b/js/plists/PList.js
@@ -36,6 +36,9 @@ define(['three'], function(THREE){
 //                editCamOutput: "Edit",
                 animate:"Preview"
             },
+            navMachineComponent:{
+                editComponent: "Edit Component"
+            },
             navComm:{
                 setupComm: "Setup",
                 send: "Send"