diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/directoryBrowser.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/directoryBrowser.aspx
index d7988fd0cc..bdb30fd628 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/directoryBrowser.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/directoryBrowser.aspx
@@ -1,12 +1,12 @@
-<%@ Page Language="C#" AutoEventWireup="True" MasterPageFile="../../masterpages/umbracoPage.Master" CodeBehind="DirectoryBrowser.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Developer.Packages.DirectoryBrowser" %>
+<%@ Page Language="C#" AutoEventWireup="True" MasterPageFile="../../masterpages/umbracoDialog.Master" CodeBehind="DirectoryBrowser.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Developer.Packages.DirectoryBrowser" %>
 
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="cdf" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
-    
+
     <cdf:CssInclude ID="CssInclude1" runat="server" FilePath="Editors/DirectoryBrowser.css" PathNameAlias="UmbracoClient"></cdf:CssInclude>
-    
+
     <script type="text/javascript">
         function postPath(path) {
             var elementId = '<%=Target%>';
@@ -18,7 +18,9 @@
 </asp:Content>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
-    <cc1:Pane runat="server" Width="100px" ID="pane">
-        <asp:PlaceHolder runat="server" ID="Output"></asp:PlaceHolder>
-    </cc1:Pane>
+    <div class="umb-dialog-body">
+        <cc1:Pane runat="server" Width="100px" ID="pane">
+            <asp:PlaceHolder runat="server" ID="Output"></asp:PlaceHolder>
+        </cc1:Pane>
+    </div>
 </asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltVisualize.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltVisualize.aspx
index 6a7d836b4c..bfeecde25d 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltVisualize.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltVisualize.aspx
@@ -1,5 +1,6 @@
 <%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoDialog.Master" AutoEventWireup="true"
     CodeBehind="xsltVisualize.aspx.cs" ValidateRequest="false" Inherits="umbraco.presentation.umbraco.developer.Xslt.xsltVisualize" %>
+
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="cc2" Namespace="umbraco.controls" Assembly="umbraco" %>
 
@@ -7,7 +8,7 @@
 
     <script type="text/javascript">
 
-        jQuery(document).ready(function() {
+        jQuery(document).ready(function () {
             var xsltSelection = jQuery("#<%=xsltSelection.ClientID %>");
             if (xsltSelection.val() == '') {
                 xsltSelection.val(UmbClientMgr.contentFrame().xsltSnippet);
@@ -24,38 +25,46 @@
             var html = jQuery("#result").html();
             if (isChecked) {
                 jQuery("#result").html(
-                    html.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\n/g,"<br/>").replace(/\r/g,""));
+                    html.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\n/g, "<br/>").replace(/\r/g, ""));
             } else {
-            jQuery("#result").html(
-                    html.replace(/<BR>/g, "\n").replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>'));
+                jQuery("#result").html(
+                        html.replace(/<BR>/g, "\n").replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>'));
+            }
         }
-        }
-</script>
+    </script>
 
 </asp:Content>
 <asp:Content ContentPlaceHolderID="body" runat="server">
-<cc1:Pane ID="Pane1" runat="server" Text="Visualize XSLT">
 
-    <cc1:PropertyPanel ID="PropertyPanel1" runat="server">
-        <input type="hidden" runat="server" id="xsltSelection" />
-        <cc2:ContentPicker ID="contentPicker" runat="server" /> <br /> <br />
-    </cc1:PropertyPanel>
+    <div class="umb-dialog-body">
 
-    <cc1:PropertyPanel runat="server">
-        <input type="checkbox" id="encodeDecode" onclick="encodeDecodeResult(this.checked)" />  <label for="encodeDecode">Encode/Decode result</label>
-    </cc1:PropertyPanel>
-    
-   
-</cc1:Pane>
+        <cc1:Pane ID="Pane1" runat="server" Text="Visualize XSLT">
 
-<cc1:Pane ID="visualizeContainer" runat="server" Text="Generated Result" Visible="false">
-    <cc1:PropertyPanel ID="visualizePanel" runat="server">
-        <asp:Literal ID="visualizeArea" runat="server"></asp:Literal>
-    </cc1:PropertyPanel>
-</cc1:Pane>
+            <cc1:PropertyPanel ID="PropertyPanel1" runat="server">
+                <input type="hidden" runat="server" id="xsltSelection" />
+                <cc2:ContentPicker ID="contentPicker" runat="server" />
+                <br />
+                <br />
+            </cc1:PropertyPanel>
+
+            <cc1:PropertyPanel runat="server">
+                <input type="checkbox" id="encodeDecode" onclick="encodeDecodeResult(this.checked)" />
+                <label for="encodeDecode">Encode/Decode result</label>
+            </cc1:PropertyPanel>
 
 
- <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+        </cc1:Pane>
+
+        <cc1:Pane ID="visualizeContainer" runat="server" Text="Generated Result" Visible="false">
+            <cc1:PropertyPanel ID="visualizePanel" runat="server">
+                <asp:Literal ID="visualizeArea" runat="server"></asp:Literal>
+            </cc1:PropertyPanel>
+        </cc1:Pane>
+
+
+        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
             <asp:Button ID="visualizeDo" runat="server" CssClass="btn btn-primary" Text="Visualize XSLT" OnClick="visualizeDo_Click" />
- </div>
-</asp:Content>
\ No newline at end of file
+        </div>
+
+    </div>
+</asp:Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx
index 852a5b9943..91b8cab283 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx
@@ -1,13 +1,14 @@
-<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="AssignDomain2.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.AssignDomain2" %>
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="AssignDomain2.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.AssignDomain2" %>
+
 <%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
-<umb:JsInclude runat="server" FilePath="Dialogs/AssignDomain2.js" PathNameAlias="UmbracoClient" />
-<umb:JsInclude runat="server" FilePath="Application/JQuery/jquery.validate.min.js" PathNameAlias="UmbracoClient" />
-<umb:CssInclude runat="server" FilePath="Dialogs/AssignDomain2.css" PathNameAlias="UmbracoClient" />
-<script type="text/javascript">
+    <umb:JsInclude runat="server" FilePath="Dialogs/AssignDomain2.js" PathNameAlias="UmbracoClient" />
+    <umb:JsInclude runat="server" FilePath="Application/JQuery/jquery.validate.min.js" PathNameAlias="UmbracoClient" />
+    <umb:CssInclude runat="server" FilePath="Dialogs/AssignDomain2.css" PathNameAlias="UmbracoClient" />
+    <script type="text/javascript">
     (function ($) {
         $(document).ready(function () {
             var dialog = new Umbraco.Dialogs.AssignDomain2({
@@ -20,23 +21,23 @@
         dialog.init();
     });
     })(jQuery);
-</script>
+    </script>
 </asp:Content>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
-    
+
     <div class="umb-dialog-body">
 
-    <cc1:Feedback ID="feedback" runat="server" />    
-    <div id="komask"></div>
-    
-         <cc1:Pane runat="server" ID="pane_language">
+        <cc1:Feedback ID="feedback" runat="server" />
+        <div id="komask"></div>
+
+        <cc1:Pane runat="server" ID="pane_language">
             <cc1:PropertyPanel runat="server" ID="prop_language">
                 <select class="umb-editor umb-dropdown" name="language" data-bind="options: languages, optionsText: 'Code', optionsValue: 'Id', value: language, optionsCaption: '<%=umbraco.ui.Text("assignDomain", "inherit") %>    '"></select>
-            <!--    <small class="help-inline"><%=umbraco.ui.Text("assignDomain", "setLanguageHelp") %></small>-->
+                <!--    <small class="help-inline"><%=umbraco.ui.Text("assignDomain", "setLanguageHelp") %></small>-->
             </cc1:PropertyPanel>
         </cc1:Pane>
-    
+
 
         <cc1:Pane runat="server" ID="pane_domains">
             <cc1:PropertyPanel runat="server">
@@ -50,29 +51,31 @@
                     </thead>
                     <tbody data-bind="foreach: domains">
                         <tr>
-                            <td valign="top"><input class="domain" data-bind="value: Name, uniqueName: true"  /><input type="hidden" value="0" /></td>
-                            <td valign="top"><select class="language" data-bind="options: $parent.languages, optionsText: 'Code', optionsValue: 'Id', value: Lang, uniqueName: true"></select></td>
+                            <td valign="top">
+                                <input class="domain" data-bind="value: Name, uniqueName: true" /><input type="hidden" value="0" /></td>
+                            <td valign="top">
+                                <select class="language" data-bind="options: $parent.languages, optionsText: 'Code', optionsValue: 'Id', value: Lang, uniqueName: true"></select></td>
                             <td valign="top"><a href="#" class="btn btn-danger" data-bind="click: $parent.removeDomain"><i class="icon icon-trash"></i></a></td>
                         </tr>
                     </tbody>
                 </table>
             </cc1:PropertyPanel>
-            
+
             <cc1:PropertyPanel runat="server">
-                <small data-bind="visible: domains().length == 0" class="help-inline"><%=umbraco.ui.Text("assignDomain", "domainHelp") %></small>    
-                <button class="btn" data-bind="click: addDomain"><%=umbraco.ui.Text("assignDomain", "addNew") %></button>        
+                <small data-bind="visible: domains().length == 0" class="help-inline"><%=umbraco.ui.Text("assignDomain", "domainHelp") %></small>
+                <button class="btn" data-bind="click: addDomain"><%=umbraco.ui.Text("assignDomain", "addNew") %></button>
             </cc1:PropertyPanel>
 
-               
+
         </cc1:Pane>
 
-        </div>
+    </div>
 
 
 
-        <div runat="server" ID="p_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-             <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel")%></a>  
-             <button class="btn btn-primary" id="btnSave"><%=umbraco.ui.Text("buttons", "save") %></button>
-        </div>
+    <div runat="server" id="p_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel")%></a>
+        <button class="btn btn-primary" id="btnSave"><%=umbraco.ui.Text("buttons", "save") %></button>
+    </div>
 
-</asp:Content>
\ No newline at end of file
+</asp:Content>