diff --git a/src/Umbraco.Web.UI/umbraco/developer/Python/editPython.aspx b/src/Umbraco.Web.UI/umbraco/developer/Python/editPython.aspx
index 14780549a2..082c480869 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Python/editPython.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Python/editPython.aspx
@@ -31,11 +31,18 @@
         })(jQuery);
         
     </script>
+
+
 </asp:Content>
 <asp:Content ID="cp1" runat="server" ContentPlaceHolderID="body">
-    <cc1:UmbracoPanel ID="UmbracoPanel1" runat="server" Text="Edit scripting file" Height="300"
-        Width="600">
+    <cc1:TabView ID="UmbracoPanel1" runat="server" Text="Edit scripting file">
+        
         <cc1:Pane ID="Pane1" runat="server" Style="margin-bottom: 10px;">
+            <cc1:CodeArea ID="pythonSource" ClientSaveMethod="doSubmit" AutoSuggest="true"  CodeBase="Razor" AutoResize="true" OffSetX="47"
+                OffSetY="55" runat="server" />
+        </cc1:Pane>
+
+        <cc1:Pane ID="Pane2" runat="server">
             <cc1:PropertyPanel ID="pp_filename" Text="Filename" runat="server">
                 <asp:TextBox ID="pythonFileName" runat="server" Width="400" CssClass="guiInputText"></asp:TextBox>
             </cc1:PropertyPanel>
@@ -46,8 +53,6 @@
                 <div id="errorDiv" style="position: relative; display: none;" class="error">
                     -</div>
             </cc1:PropertyPanel>
-            <cc1:CodeArea ID="pythonSource" ClientSaveMethod="doSubmit" AutoSuggest="true"  CodeBase="Razor" AutoResize="true" OffSetX="47"
-                OffSetY="55" runat="server" />
         </cc1:Pane>
-    </cc1:UmbracoPanel>
+    </cc1:TabView>
 </asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx
index a4368ada4c..89d60c3ae9 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx
@@ -43,33 +43,29 @@
                 xsltSnippet = UmbEditor.IsSimpleEditor
                 ? jQuery("#<%= editorSource.ClientID %>").val()
                     : UmbEditor.GetCode();
-                //                alert('Please select the xslt to visualize');
             }
 
             UmbClientMgr.openModalWindow('<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>/developer/xslt/xsltVisualize.aspx', 'Visualize XSLT', true, 550, 650);
-        }
-		  
+        } 
     </script>
     <umb:JsInclude ID="JsInclude1" runat="server" FilePath="Application/jQuery/jquery-fieldselection.js"
         PathNameAlias="UmbracoClient" />
 </asp:Content>
 <asp:Content ContentPlaceHolderID="body" runat="server" ID="cp1">
-    <cc1:UmbracoPanel ID="UmbracoPanel1" runat="server" Text="Edit xsl" hasMenu="true"
-        Height="300" Width="600">
-        <cc1:Pane ID="Pane1" runat="server" Style="margin-bottom: 10px;">
-            <cc1:PropertyPanel ID="pp_filename" runat="server" Text="Filename">
-                <asp:TextBox ID="xsltFileName" runat="server" Width="300" CssClass="guiInputText"></asp:TextBox>
-            </cc1:PropertyPanel>
-            <cc1:PropertyPanel ID="pp_testing" runat="server" Text="Skip testing (ignore errors)">
-                <asp:CheckBox ID="SkipTesting" runat="server"></asp:CheckBox>
-            </cc1:PropertyPanel>
-            <cc1:PropertyPanel ID="pp_errorMsg" runat="server">
-                <div id="errorDiv" style="display: none;" class="error">
-                    test</div>
-            </cc1:PropertyPanel>
-            <cc1:CodeArea ID="editorSource" CodeBase="XML" runat="server" AutoResize="true" OffSetX="47" OffSetY="55" />
-        </cc1:Pane>
-    </cc1:UmbracoPanel>
+    <cc1:TabView ID="UmbracoPanel1" runat="server" Text="Edit xsl" hasMenu="true">
+            <cc1:Pane runat="server" ID="pane1">
+                <cc1:CodeArea ID="editorSource" CodeBase="XML" runat="server" AutoResize="true" OffSetX="47" OffSetY="55" />
+            </cc1:Pane>
+            
+            <cc1:Pane runat="server" ID="pane2">
+                 <cc1:PropertyPanel ID="pp_filename" runat="server" Text="Filename">
+                    <asp:TextBox ID="xsltFileName" runat="server" Width="300" CssClass="guiInputText"></asp:TextBox>
+                </cc1:PropertyPanel>
+                <cc1:PropertyPanel ID="pp_testing" runat="server" Text="Skip testing (ignore errors)">
+                    <asp:CheckBox ID="SkipTesting" runat="server"></asp:CheckBox>
+                </cc1:PropertyPanel>
+            </cc1:Pane>
+    </cc1:TabView>
 </asp:Content>
 <asp:Content ContentPlaceHolderID="footer" runat="server">
     <asp:Literal ID="editorJs" runat="server"></asp:Literal>
diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditMacroScripts.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditMacroScripts.js
index 8215461336..9cd90f4efa 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditMacroScripts.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditMacroScripts.js
@@ -46,9 +46,7 @@
 
         submitSucces: function(t) {
             if (t != 'true') {
-                top.UmbSpeechBubble.ShowMessage('error', 'Saving scripting file failed', '');
-                jQuery('#errorDiv').html('<p><a href="#" style="position: absolute; right: 10px; top: 10px;" onclick=\'closeErrorDiv()\'>Hide Errors</a><strong>Error occured</strong></p><p>' + t + '</p>');
-                jQuery('#errorDiv').slideDown('fast');
+                top.UmbSpeechBubble.ShowMessage('error', 'Saving scripting file failed', t);
             }
             else {
                 top.UmbSpeechBubble.ShowMessage('save', 'Scripting file saved', '');
diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditXslt.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditXslt.js
index 07cd265c6d..ca33ebcd2e 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditXslt.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditXslt.js
@@ -29,8 +29,6 @@
         doSubmit: function () {
             var self = this;
 
-            $('#errorDiv').hide();
-
             var fileName = this._opts.nameTxtBox.val();
             var codeVal = this._opts.editorSourceElement.val();
             //if CodeMirror is not defined, then the code editor is disabled.
@@ -46,9 +44,7 @@
 
         submitSucces: function (t) {
             if (t != 'true') {
-                top.UmbSpeechBubble.ShowMessage('error', 'Saving Xslt file failed', '');
-                jQuery('#errorDiv').html('<p><a href="#" onclick=\'closeErrorDiv()\'>Hide Errors</a><strong>Error occured</strong></p><p>' + t + '</p>');
-                jQuery('#errorDiv').slideDown('fast');
+                top.UmbSpeechBubble.ShowMessage('error', 'Saving Xslt file failed',"<pre>" + t + "</pre>");
             }
             else {
                 top.UmbSpeechBubble.ShowMessage('save', 'Xslt file saved', '');
@@ -62,7 +58,8 @@
             this._opts.originalFileName = newFilePath;
         },
 
-        submitFailure: function(t) {
+        submitFailure: function (t) {
+            alert(t);
             top.UmbSpeechBubble.ShowMessage('warning', 'Xslt file could not be saved', '');
         }
     });
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Python/editPython.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Python/editPython.aspx.cs
index ccbcd6fb6d..e6090fe676 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Python/editPython.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Python/editPython.aspx.cs
@@ -29,7 +29,7 @@ namespace umbraco.cms.presentation.developer
 
         }
 
-        protected MenuIconI SaveButton;
+        protected MenuButton SaveButton;
 
         private readonly List<string> _allowedExtensions = new List<string>();
         protected PlaceHolder buttons;
@@ -69,10 +69,21 @@ namespace umbraco.cms.presentation.developer
         {
             base.OnInit(e);
 
-            SaveButton = UmbracoPanel1.Menu.NewIcon();
-            SaveButton.ImageURL = SystemDirectories.Umbraco + "/images/editor/save.gif";
-            SaveButton.AltText = "Save scripting File";
+            SaveButton = UmbracoPanel1.Menu.NewButton();
+           
+            SaveButton.ToolTip = "Save scripting File";
+            SaveButton.Text = ui.Text("save");
+            SaveButton.OnClientClick = "return false;";
             SaveButton.ID = "save";
+            SaveButton.ButtonType = MenuButtonType.Primary;
+
+
+            var code = UmbracoPanel1.NewTabPage("code");
+            code.Controls.Add(Pane1);
+
+            var props = UmbracoPanel1.NewTabPage("properties");
+            props.Controls.Add(Pane2);
+
 
             // Add source and filename
             String file = IOHelper.MapPath(SystemDirectories.MacroScripts + "/" + Request.QueryString["file"]);
@@ -107,7 +118,7 @@ namespace umbraco.cms.presentation.developer
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::umbraco.uicontrols.UmbracoPanel UmbracoPanel1;
+        protected global::umbraco.uicontrols.TabView UmbracoPanel1;
 
         /// <summary>
         /// Pane1 control.
@@ -117,6 +128,7 @@ namespace umbraco.cms.presentation.developer
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::umbraco.uicontrols.Pane Pane1;
+        protected global::umbraco.uicontrols.Pane Pane2;
 
         /// <summary>
         /// pp_filename control.
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs
index 1f926b4cca..5b1ec90e04 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs
@@ -28,7 +28,7 @@ namespace umbraco.cms.presentation.developer
 
 		protected PlaceHolder buttons;
 
-        protected MenuIconI SaveButton;
+        protected MenuButton SaveButton;
 
 		protected void Page_Load(object sender, EventArgs e)
 		{
@@ -48,49 +48,54 @@ namespace umbraco.cms.presentation.developer
 		protected override void OnInit(EventArgs e)
 		{			
 			base.OnInit(e);
-            
-            SaveButton = UmbracoPanel1.Menu.NewIcon();
-            SaveButton.ImageURL = SystemDirectories.Umbraco + "/images/editor/save.gif";
-            SaveButton.AltText = "Save Xslt File";
+
+            SaveButton = UmbracoPanel1.Menu.NewButton();
+            SaveButton.ToolTip = "Save Xslt File";
+            SaveButton.Text = ui.Text("save");
+            SaveButton.ButtonType = MenuButtonType.Primary;
             SaveButton.ID = "save";
 
-			UmbracoPanel1.Menu.InsertSplitter();
+            var code = UmbracoPanel1.NewTabPage("xslt");
+            code.Controls.Add(pane1);
 
-			var tmp = UmbracoPanel1.Menu.NewIcon();
+            var props = UmbracoPanel1.NewTabPage("properties");
+            props.Controls.Add(pane2);
+
+            var tmp = editorSource.Menu.NewIcon();
 			tmp.ImageURL = IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/images/editor/insField.GIF";
 			tmp.OnClickCommand = ClientTools.Scripts.OpenModalWindow(IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/developer/xslt/xsltinsertvalueof.aspx?objectId=" + editorSource.ClientID, "Insert value", 750, 250);
 			//"umbracoInsertField(document.getElementById('editorSource'), 'xsltInsertValueOf', '','felt', 750, 230, '');";
 			tmp.AltText = "Insert xslt:value-of";
 
-			UmbracoPanel1.Menu.InsertSplitter();
+            editorSource.Menu.InsertSplitter();
 
-			tmp = UmbracoPanel1.Menu.NewIcon();
+            tmp = editorSource.Menu.NewIcon();
 			tmp.ImageURL = SystemDirectories.Umbraco + "/images/editor/insMemberItem.GIF";
 			tmp.OnClickCommand = "UmbEditor.Insert('<xsl:variable name=\"\" select=\"', '\"/>\\n', '" + editorSource.ClientID + "'); return false;";
 			tmp.AltText = "Insert xsl:variable";
 
-			UmbracoPanel1.Menu.InsertSplitter();
+            editorSource.Menu.InsertSplitter();
 
-			tmp = UmbracoPanel1.Menu.NewIcon();
+            tmp = editorSource.Menu.NewIcon();
 			tmp.ImageURL = SystemDirectories.Umbraco + "/images/editor/insChildTemplateNew.GIF";
 			tmp.OnClickCommand = "UmbEditor.Insert('<xsl:if test=\"CONDITION\">\\n', '\\n</xsl:if>\\n', '" + editorSource.ClientID + "'); return false;";
 			tmp.AltText = "Insert xsl:if";
 
-			tmp = UmbracoPanel1.Menu.NewIcon();
+            tmp = editorSource.Menu.NewIcon();
 			tmp.ImageURL = SystemDirectories.Umbraco + "/images/editor/insChildTemplateNew.GIF";
 			tmp.OnClickCommand = "UmbEditor.Insert('<xsl:for-each select=\"QUERY\">\\n', '\\n</xsl:for-each>\\n', '" + editorSource.ClientID + "'); return false;";
 			tmp.AltText = "Insert xsl:for-each";
 
-			UmbracoPanel1.Menu.InsertSplitter();
+            editorSource.Menu.InsertSplitter();
 
-			tmp = UmbracoPanel1.Menu.NewIcon();
+            tmp = editorSource.Menu.NewIcon();
 			tmp.ImageURL = SystemDirectories.Umbraco + "/images/editor/insFieldByLevel.GIF";
 			tmp.OnClickCommand = "UmbEditor.Insert('<xsl:choose>\\n<xsl:when test=\"CONDITION\">\\n', '\\n</xsl:when>\\n<xsl:otherwise>\\n</xsl:otherwise>\\n</xsl:choose>\\n', '" + editorSource.ClientID + "'); return false;";
 			tmp.AltText = "Insert xsl:choose";
 
-			UmbracoPanel1.Menu.InsertSplitter();
+            editorSource.Menu.InsertSplitter();
 
-			tmp = UmbracoPanel1.Menu.NewIcon();
+            tmp = editorSource.Menu.NewIcon();
 			tmp.ImageURL = SystemDirectories.Umbraco + "/images/editor/xslVisualize.GIF";
 			tmp.OnClickCommand = "xsltVisualize();";
 			tmp.AltText = "Visualize XSLT";
@@ -143,7 +148,7 @@ namespace umbraco.cms.presentation.developer
 		/// Auto-generated field.
 		/// To modify move field declaration from designer file to code-behind file.
 		/// </remarks>
-		protected global::umbraco.uicontrols.UmbracoPanel UmbracoPanel1;
+		protected global::umbraco.uicontrols.TabView UmbracoPanel1;
 
 		/// <summary>
 		/// Pane1 control.
@@ -152,7 +157,8 @@ namespace umbraco.cms.presentation.developer
 		/// Auto-generated field.
 		/// To modify move field declaration from designer file to code-behind file.
 		/// </remarks>
-		protected global::umbraco.uicontrols.Pane Pane1;
+		protected global::umbraco.uicontrols.Pane pane1;
+        protected global::umbraco.uicontrols.Pane pane2;
 
 		/// <summary>
 		/// pp_filename control.