diff --git a/css/main.css b/css/main.css
index 7be3ac5fb19d665bf2488a1f7f0fe99d8500019a..ad000aafd186c076859e6401222afc99d08d6d9e 100644
--- a/css/main.css
+++ b/css/main.css
@@ -399,3 +399,7 @@ label.colorSwatches>span.icons{
     opacity: 0.6;
     margin: 0 20px 0 -10px;
 }
+
+.editComposite {
+    margin-left:20px;
+}
diff --git a/js/lattice/CompositeEditorLattice.js b/js/lattice/CompositeEditorLattice.js
index f5c470a875bc9b0f4fe7ea9d5768ccb26e2ebcf0..7e3eeee05cfaf4eeca77a74d3cec75534dfe98fc 100644
--- a/js/lattice/CompositeEditorLattice.js
+++ b/js/lattice/CompositeEditorLattice.js
@@ -66,6 +66,11 @@ define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'th
             globals.materials.compositeMaterials[id] = data;//todo trigger change on all instances
         },
 
+        deleteComposite: function(){
+            var id = this.get("compositeId");
+            delete globals.materials.compositeMaterials[id];//todo trigger change on all instances
+        },
+
         _undoCompositeEditor: function(){
             var self = this;
             _.each(_.keys(CompositeEditorLattice), function(key){
diff --git a/js/menus/CompositeMenu.js b/js/menus/CompositeMenu.js
index 9ad79a81ba0b379b0bdf259d4b6f8b906576124f..dc4b1e13582f82b73ef587e4e08d24166aaac4c5 100644
--- a/js/menus/CompositeMenu.js
+++ b/js/menus/CompositeMenu.js
@@ -10,7 +10,8 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _
             "click #newRandomColor":                                  "_changeRandomColor",
             "click #finishComposite":                                 "_finishComposite",
             "click #saveComposite":                                   "_saveComposite",
-            "click #cancelComposite":                                 "_cancelComposite"
+            "click #cancelComposite":                                 "_cancelComposite",
+            "click #deleteComposite":                                 "_deleteComposite"
         },
 
         _initialize: function(){
@@ -33,16 +34,25 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _
             e.preventDefault();
             this.stopListening();
             lattice.makeNewCompositeMaterial($("#compositeName").val());
-            this.model.set("currentNav", "navDesign");
+            this._exit();
         },
 
         _saveComposite: function(e){
             e.preventDefault();
-
         },
 
         _cancelComposite: function(e){
             e.preventDefault();
+            this._exit();
+        },
+
+        _deleteComposite: function(e){
+            e.preventDefault();
+            lattice.deleteComposite();
+            this._exit();
+        },
+
+        _exit: function(){
             this.model.set("currentNav", "navDesign");
         },
 
@@ -59,9 +69,9 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _
             Display Color:   \
             <input style="border-color: <%= compositeColor %> ;" value="<%= compositeColor %>" placeholder="Enter HEX" class="halfWidth form-control" type="text"><br/><br/>\
             <a id="newRandomColor" href="#" class="btn btn-block btn-lg btn-default">New Random Color</a><br/><br/>\
-            <a id="finishComposite" href="#" class="btn btn-halfWidth btn-lg btn-success">Finish Composite</a>\
-            <a id="cancelComposite" href="#" class="btn btn-halfWidth pull-right btn-lg btn-default">Cancel / Exit</a><br/>\
-            \
+            <a id="cancelComposite" href="#" class="btn btn-halfWidth btn-lg btn-default">Cancel / Exit</a>\
+            <a id="deleteComposite" href="#" class="btn btn-halfWidth pull-right btn-lg btn-default"><span class="fui-trash"></span> Delete</a><br/><br/>\
+            <a id="finishComposite" href="#" class="btn btn-block btn-lg btn-success">Finish Composite</a><br/>\
             ')
 
     });
diff --git a/js/menus/MaterialMenuView.js b/js/menus/MaterialMenuView.js
index db6df9f5f742d9832865444c4c61b322c06da440..05e56ea3f6da3a595d33294fb70ade291cd0b931 100644
--- a/js/menus/MaterialMenuView.js
+++ b/js/menus/MaterialMenuView.js
@@ -71,7 +71,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'globals'], fu
                 <input type="radio" <%if (key == materialType){ %>checked<%}%> name="materialType" value="<%= key %>" data-toggle="radio" class="custom-radio lattice"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>\
                 <div class="materialColorSwatch">\
                 <div style="background-color:<% if(realisticColorScheme){ %><%= materials.compositeMaterials[key].color %><% }else{ %><%= materials.compositeMaterials[key].altColor %><% } %>"></div>\
-                <span><%= materials.compositeMaterials[key].name %><a data-id="<%= key %>" class="editComposite">Edit</a></span></div>\
+                <span><%= materials.compositeMaterials[key].name %><a data-id="<%= key %>" class="editComposite">Settings...<a/></span></div>\
             </label>\
             <% }); %><br/>\
             <a id="navToCompositeMenu" href="#" class="btn btn-block btn-lg btn-default">+ Create New Composite Material</a><br/>\