2 files changed, 16 insertions, 30 deletions

diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
index ec092604..8c81b3ab 100644
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
@@ -97,12 +97,13 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
             this.application.ninja.currentDocument._window.addComponent(element, {type: "Button", path: component.module, name: "Button"}, function(instance, element) {
 
                 var styles = {
-                                'position': 'absolute',
-                                'top'       : that._stash.dropx + 'px',
-                                'left'      : that._stash.dropy + 'px',
-                                '-webkit-transform-style' : 'preserve-3d',
-                                '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)'
-                            };
+                    'position': 'absolute',
+                    'top'       : that._stash.dropy + 'px',
+                    'left'      : that._stash.dropx + 'px',
+                    '-webkit-transform-style' : 'preserve-3d',
+                    '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)'
+                };
+
 
                 that.application.ninja.currentDocument.setComponentInstance(instance, element);
 
@@ -134,6 +135,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
         value: function(name) {
             var el;
             el = NJUtils.makeNJElement(name, "Button", "component");
+            //el.elementModel.pi = "buttonPi";
             el.setAttribute("type", "button");
             return el;
         }
diff --git a/user-document-templates/montage-application-cloud/main.reel/main.js b/user-document-templates/montage-application-cloud/main.reel/main.js
index 90262073..b4ed049f 100644
--- a/user-document-templates/montage-application-cloud/main.reel/main.js
+++ b/user-document-templates/montage-application-cloud/main.reel/main.js
@@ -37,36 +37,20 @@ exports.Main = Montage.create(Component, {
             switch(componentType.type){
                 case "Button":
 
-                    //var tmpFix = ("montage/ui/button.reel");
-                    //var str = "montage/ui/button.reel";
-                    var stro = componentType.path;
-
-//                    var button = (stro);
-
-                    var button = require.async(stro)
+                    var button = require.async(componentType.path)
                     .then(function (button) {
-                            var btIns = button["Button"];
+                        var buttonObj = button["Button"];
+                        var btIns = buttonObj.create();
 
-                            btIns.element = containerElement;
-                            btIns.deserializedFromTemplate();
+                        btIns.element = containerElement;
+                        btIns.deserializedFromTemplate();
 
-                            btIns.needsDraw = true;
-                            btIns.label = "Button";
-                       callback(btIns, containerElement);
+                        btIns.needsDraw = true;
+                        btIns.label = "Button";
+                        callback(btIns, containerElement);
                     })
                     .end();
 
-                    /*
-                    var buttonInstance = button[componentType.name];
-
-                    buttonInstance.element = containerElement;
-                    buttonInstance.deserializedFromTemplate();
-
-                    buttonInstance.needsDraw = true;
-                    buttonInstance.label = "Button";
-
-                    return buttonInstance;
-                    */
                     break;
                 case "Checkbox":
                     component = Checkbox.create();