diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js
index 99e2fca98d..5b7bafc459 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js
@@ -12,7 +12,7 @@ function InsertMacroController($scope, entityResource, macroResource, umbPropEdi
     /** changes the view to edit the params of the selected macro */
     function editParams() {
         //get the macro params if there are any
-        macroResource.getMacroParameters($scope.selectedMacro)
+        macroResource.getMacroParameters($scope.selectedMacro.id)
             .then(function (data) {
 
                 //go to next page if there are params otherwise we can just exit
@@ -49,9 +49,11 @@ function InsertMacroController($scope, entityResource, macroResource, umbPropEdi
         });
 
         //need to find the macro alias for the selected id
-        var macroAlias = _.find($scope.macros, function (item) {
-            return item.id == $scope.selectedMacro;
-        }).alias;
+        var macroAlias = $scope.selectedMacro.alias;
+
+         /* _.find($scope.macros, function (item) {
+            return item.id == $scope.selectedMacro.id;
+        }).alias;*/
 
         //get the syntax based on the rendering engine
         var syntax;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html
index 7e2b8e330c..b35eb6b083 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html
@@ -1,27 +1,27 @@
 <form novalidate name="insertMacroForm" ng-submit="submitForm()" ng-controller="Umbraco.Dialogs.InsertMacroController">
     <div class="umb-panel" val-show-validation>        
 
-        <div class="umb-panel-header">
-            <div class="umb-el-wrap umb-panel-buttons">
-                <div class="btn-toolbar umb-btn-toolbar">
-                    <button type="button" class="btn" ng-click="close()">Cancel</button>
+        <div class="umb-panel-footer">
+                <div class="btn-toolbar umb-btn-toolbar pull-right">
+                    <button type="button" class="btn btn-link" ng-click="close()">Cancel</button>
                     <button type="submit" class="btn btn-primary">Ok</button>
                 </div>
-            </div>
         </div>
 
-        <div class="umb-panel-body umb-scrollable" auto-scale="1">
+        <div class="umb-panel-body no-header umb-scrollable" auto-scale="1">
             <div class="umb-control-group" ng-switch="wizardStep">
                 <div class="umb-pane" ng-switch-when="macroSelect">
 
                     <label for="macroName">Choose a macro</label>
-                    <select name="selectedMacro" ng-model="$parent.selectedMacro" ng-options="m.id as m.name for m in macros" required>
-                        <option value="">-- Choose macro --</option>
+                    <select class="umb-editor" ng-change="submitForm()" name="selectedMacro" ng-model="$parent.selectedMacro" ng-options="m as m.name for m in macros" required>
+                        <option value="">Choose macro...</option>
                     </select>
-
                 </div>
+
                 <div class="umb-pane" ng-switch-when="paramSelect">
 
+                    <h5>{{$parent.selectedMacro.name}}</h5>
+
                     <ul class="unstyled">
                         <li ng-repeat="param in $parent.macroParams">
 
@@ -29,7 +29,6 @@
                                 <label>{{param.name}}</label>
                                 <umb-editor model="param"></umb-editor>
                             </div>
-
                         </li>
                     </ul>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/macropicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/macropicker.html
index e2269193b5..a369d15f63 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/macropicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/macropicker.html
@@ -1,18 +1,7 @@
 	<div class="umb-panel" ng-controller="Umbraco.Dialogs.MacroPickerController">
-	<div class="umb-panel-header">
-		<div class="umb-el-wrap umb-panel-buttons">
-	        <div class="btn-toolbar umb-btn-toolbar">
-	         	<input type="button" ng-click="submit(dialogData)" class="btn btn-primary" value="select" />
-	        </div>
-		</div>
-	</div>
-
-
-
-	<div class="umb-panel-body umb-scrollable" auto-scale="1" ng-switch on="dialogMode">
-
+	
+	<div class="umb-panel-body no-header umb-scrollable" ng-switch on="dialogMode">
 		<div class="umb-control-group">
-
 			<div ng-switch-when="list" ng-swicth-default class="tab-content form-horizontal umb-el-wrap">
 					<ul class="nav nav-tabs nav-stacked">	
 						<li ng-repeat="macro in macros">
@@ -23,9 +12,10 @@
 					</ul>	
 			</div>
 
-
 			<div ng-switch-when="configure" class="tab-content form umb-el-wrap">
 					
+					<h5>woot {{dialogData.macro.name}}</h5>
+
 					<div class="umb-pane" ng-repeat="model in dialogData.macro.properties">
 							    <label class="control-label" ng-hide="model.hideLabel" for="{{model.alias}}">{{model.label}}
 					            </label>    
@@ -33,11 +23,16 @@
 					            <div class="controls" 
 					                ng-include="model.editorView">
 					            </div>
-
-					    
 					</div>
 			</div>
 		</div>
+	</div>
 
+	<div class="umb-panel-footer">
+		<div class="umb-el-wrap umb-panel-buttons">
+	        <div class="btn-toolbar umb-btn-toolbar">
+	         	<input type="button" ng-click="submit(dialogData)" class="btn btn-primary" value="select" />
+	        </div>
+		</div>
 	</div>
 </div>
\ No newline at end of file