diff --git a/build/Build.proj b/build/Build.proj
new file mode 100644
index 0000000000..926f54981c
--- /dev/null
+++ b/build/Build.proj
@@ -0,0 +1,240 @@
+<Project InitialTargets="Build" DefaultTargets="AfterBuild" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <!-- 
+ ****************************************************
+ INCLUDES 
+ *****************************************************
+ -->
+
+ <PropertyGroup>
+   <MSBuildCommunityTasksPath>..\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
+   <UmbracoMSBuildTasksPath>..\UmbracoMSBuildTasks</UmbracoMSBuildTasksPath>
+ </PropertyGroup>
+ 
+ <Import Project="..\tools\UmbracoMSBuildTasks\Umbraco.MSBuild.Tasks.Targets" />
+ <Import Project="..\tools\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
+
+ <!-- 
+ ****************************************************
+ VARIABLES 
+ *****************************************************
+ -->
+
+ <!-- NB: BUILD_NUMBER is passed in by the build server -->
+ <PropertyGroup Condition="'$(BUILD_NUMBER)'!=''">
+   <DECIMAL_BUILD_NUMBER>.$(BUILD_NUMBER)</DECIMAL_BUILD_NUMBER>
+ </PropertyGroup>
+ 
+ <PropertyGroup>
+   <BuildConfiguration>Release</BuildConfiguration>
+   <BuildFolder>_BuildOutput\</BuildFolder>
+   <BuildZipFileName>UmbracoCms$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileName>
+   <BuildZipFileNameBin>UmbracoCms.AllBinaries$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameBin>
+   <BuildZipFileNameWebPi>UmbracoCms.WebPI$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameWebPi>
+   <IncludeSymbols>False</IncludeSymbols>
+   <BuildFolderRelativeToProjects>..\..\build\$(BuildFolder)</BuildFolderRelativeToProjects>
+   <BuildFolderAbsolutePath>$(MSBuildProjectDirectory)\$(BuildFolder)</BuildFolderAbsolutePath>
+   <SolutionBinFolder>$(BuildFolder)bin\</SolutionBinFolder>
+   <WebAppFolder>$(BuildFolder)WebApp\</WebAppFolder>
+   <WebPiFolder>$(BuildFolder)WebPi\</WebPiFolder>
+   <SolutionBinFolderRelativeToProjects>$(BuildFolderRelativeToProjects)bin\</SolutionBinFolderRelativeToProjects>
+   <SolutionBinFolderAbsolutePath>$(BuildFolderAbsolutePath)bin\</SolutionBinFolderAbsolutePath>
+   <WebAppFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebApp\</WebAppFolderRelativeToProjects>
+   <WebAppFolderAbsolutePath>$(BuildFolderAbsolutePath)WebApp\</WebAppFolderAbsolutePath>
+   <WebPiFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebPi\</WebPiFolderRelativeToProjects>
+   <WebPiFolderAbsolutePath>$(BuildFolderAbsolutePath)WebPi\</WebPiFolderAbsolutePath>
+ </PropertyGroup>
+
+ <ItemGroup>
+   <SystemFolders Include="$(WebAppFolder)App_Code" />
+   <SystemFolders Include="$(WebAppFolder)App_Data" />
+   <SystemFolders Include="$(WebAppFolder)App_Data\ClientDependency" />
+   <SystemFolders Include="$(WebAppFolder)App_Data\ExamineIndexes" />
+   <SystemFolders Include="$(WebAppFolder)media" />
+   <SystemFolders Include="$(WebAppFolder)masterpages" />
+   <SystemFolders Include="$(WebAppFolder)scripts" />
+   <SystemFolders Include="$(WebAppFolder)css" />
+   <SystemFolders Include="$(WebAppFolder)macroScripts" />
+   <SystemFolders Include="$(WebAppFolder)xslt" />
+   <SystemFolders Include="$(WebAppFolder)usercontrols" />
+ </ItemGroup>
+
+ <!-- 
+ ****************************************************
+ TARGETS 
+ *****************************************************
+ -->
+
+ <Target Name="Build" DependsOnTargets="ZipWebPiApp">
+   <Message Text="Build finished" />
+ </Target>
+ 
+ <Target Name="CleanUp" DependsOnTargets="ZipWebPiApp">
+   <Message Text="Deleting $(BuildFolder)" Importance="high" />
+   <RemoveDir Directories="$(BuildFolder)" />
+   <Message Text="Finished deleting $(BuildFolder)" Importance="high" />
+ </Target>
+
+ <Target Name="ZipWebPiApp" DependsOnTargets="ZipWebApp" >
+
+   <!-- Clean folders -->
+   <RemoveDir Directories="$(WebPiFolder)" />
+   <MakeDir Directories="$(WebPiFolder)" />
+   <MakeDir Directories="$(WebPiFolder)umbraco" />
+
+   <!-- Copy fresh built umbraco files -->
+   <Exec Command="xcopy %22$(WebAppFolderAbsolutePath)*%22 %22$(WebPiFolderAbsolutePath)umbraco%22 /S /E /Y /I" />
+   
+   <!--<ItemGroup>
+     <WebAppFiles Include="$(WebAppFolder)\**\*.*" />
+   </ItemGroup>
+
+   <Copy SourceFiles="@(WebAppFiles)"
+       DestinationFiles="@(WebAppFiles->'$(WebPiFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />-->
+
+   <!-- Copy Web Pi template files -->
+   <ItemGroup>
+     <WebPiFiles Include="..\src\WebPi\**\*.*" />
+   </ItemGroup>
+
+   <Copy SourceFiles="@(WebPiFiles)"
+       DestinationFiles="@(WebPiFiles->'$(WebPiFolder)%(RecursiveDir)%(Filename)%(Extension)')" />
+
+   <!-- Zip the files -->
+   <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22" />
+
+ </Target>
+ 
+ <Target Name="ZipWebApp" DependsOnTargets="CreateSystemFolders" >
+   
+   <Message Text="Starting to zip to $(buildDate)-$(BuildZipFileName)" Importance="high" />
+
+   <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameBin)%22 %22$(SolutionBinFolderAbsolutePath)*%22" />
+   <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileName)%22 %22$(WebAppFolderAbsolutePath)*%22" />
+   
+   <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
+ </Target>
+
+ <Target Name="CreateSystemFolders" DependsOnTargets="CopyLibraries" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
+   <MakeDir Directories="@(SystemFolders)" />
+ </Target>
+
+ <Target Name="CopyLibraries" DependsOnTargets="OffsetTimestamps" >
+
+   <!-- Copy SQL CE -->
+   <ItemGroup>
+     <SQLCE4Files Include="..\lib\SQLCE4\**\*.*" />
+   </ItemGroup>
+
+   <Copy SourceFiles="@(SQLCE4Files)"
+       DestinationFiles="@(SQLCE4Files->'$(SolutionBinFolder)%(RecursiveDir)%(Filename)%(Extension)')"
+       OverwriteReadOnlyFiles="true"
+       SkipUnchangedFiles="false" />
+   <Copy SourceFiles="@(SQLCE4Files)"
+       DestinationFiles="@(SQLCE4Files->'$(WebAppFolder)bin\%(RecursiveDir)%(Filename)%(Extension)')"
+       OverwriteReadOnlyFiles="true"
+       SkipUnchangedFiles="false" />
+
+   <!-- Copy WebPages -->
+   <ItemGroup>
+     <WebPageFiles Include="..\lib\WebPages\*.dll" />
+   </ItemGroup>
+
+   <Copy SourceFiles="@(WebPageFiles)"
+       DestinationFiles="@(WebPageFiles->'$(SolutionBinFolder)%(RecursiveDir)%(Filename)%(Extension)')"
+       OverwriteReadOnlyFiles="true"
+       SkipUnchangedFiles="false" />
+   <Copy SourceFiles="@(WebPageFiles)"
+       DestinationFiles="@(WebPageFiles->'$(WebAppFolder)bin\%(RecursiveDir)%(Filename)%(Extension)')"
+       OverwriteReadOnlyFiles="true"
+       SkipUnchangedFiles="false" />
+   
+ </Target>
+
+ <!-- Offset the modified timestamps on all umbraco dlls, as WebResources break if date is in the future, which, due to timezone offsets can happen. -->
+ <Target Name="OffsetTimestamps" DependsOnTargets="CompileProjects">
+   <CreateItem Include="$(BuildFolder)**\umbraco.*.dll">
+     <Output TaskParameter="Include" ItemName="FilesToOffsetTimestamp" />
+   </CreateItem>
+   <Message Text="Starting to offset timestamps" Importance="high" />
+   <Umbraco.MSBuild.Tasks.TimestampOffset Files="@(FilesToOffsetTimestamp)" Offset="-11" />
+   <Message Text="Finished offsetting timestamps" Importance="high" />
+ </Target>
+ 
+ <Target Name="CompileProjects">
+
+   <Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
+   <!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
+   <MSBuild Projects="..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath)" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+   </MSBuild>
+
+   <!--     
+   Now, because of all the circular dependencies we need to build those projects and have them dump their DLLs/assets out to the same folder. Really wish this wasn't the case! 
+   These are:    umbraco.editorControls    umbraco.webservices    umbraco.MacroEngines
+   
+   Each of these projects has a post build to put their stuff in the correct location based on the solution and unfortunately for us each 
+   of these projects references the web application! So if we specify an OutDir parameter it will also trigger a web deploy and chuck another
+   website output in bin/_PublishedWebSites folder. we cannot disable this: http://social.msdn.microsoft.com/forums/en-US/tfsbuild/thread/3ec642ad-2e6d-424c-891a-62f6409da62a/
+   so we need to just build the project 'in-place' then copy its output to the SolutionBinFolder    
+   -->
+
+   <!-- MACRO ENGINES -->
+   <Message Text="Compiling MacroEngines project" Importance="high" />
+   <MSBuild Projects="..\src\umbraco.MacroEngines\umbraco.MacroEngines.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+   </MSBuild>
+   <ItemGroup>
+     <MacroEngineDll Include="..\src\umbraco.MacroEngines\bin\$(BuildConfiguration)\umbraco.MacroEngines.dll"/>
+   </ItemGroup>
+   <Copy SourceFiles="@(MacroEngineDll)"
+         DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
+   <Copy SourceFiles="@(MacroEngineDll)"
+           DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>
+
+   <!-- EDITOR CONTROLS -->
+   <Message Text="Compiling editorControls project" Importance="high" />
+   <MSBuild Projects="..\src\umbraco.editorControls\umbraco.editorControls.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+   </MSBuild>
+   <ItemGroup>
+     <EditorControlsDll Include="..\src\umbraco.editorControls\bin\$(BuildConfiguration)\umbraco.editorControls.dll"/>
+   </ItemGroup>
+   <Copy SourceFiles="@(EditorControlsDll)"
+         DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
+   <Copy SourceFiles="@(EditorControlsDll)"
+           DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>
+
+   <!-- WEBSERVICES -->
+   <Message Text="Compiling webservices project" Importance="high" />
+   <MSBuild Projects="..\src\umbraco.webservices\umbraco.webservices.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+   </MSBuild>
+   <ItemGroup>
+     <WebServicesDll Include="..\src\umbraco.webservices\bin\$(BuildConfiguration)\umbraco.webservices.dll"/>
+     <WebServicesASMX Include="..\src\umbraco.webservices\*.asmx"/>
+   </ItemGroup>
+   <Copy SourceFiles="@(WebServicesDll)"
+         DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
+   <Copy SourceFiles="@(WebServicesDll)"
+         DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>
+   <Copy SourceFiles="@(WebServicesASMX)"
+           DestinationFolder="$(WebAppFolder)\umbraco\webservices\api" OverwriteReadOnlyFiles="True"/>
+
+   <!-- SQLCE4UMBRACO -->
+   <!--<Message Text="Compiling SQLCE4Umbraco project" Importance="high" />
+   <MSBuild Projects="..\src\SQLCE4Umbraco\SQLCE4Umbraco.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+   </MSBuild>
+   <ItemGroup>
+     <SQLCE4UmbracoDll Include="..\src\SQLCE4Umbraco\bin\$(BuildConfiguration)\SQLCE4Umbraco.dll" />
+   </ItemGroup>
+   <Copy SourceFiles="@(SQLCE4UmbracoDll)"
+         DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
+   <Copy SourceFiles="@(SQLCE4UmbracoDll)"
+         DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>-->
+
+   <!-- DONE -->
+   <Message Text="Finished compiling projects" Importance="high" />
+ </Target>
+ 
+ <Target Name="AfterBuild">
+   <Message Text="Hi" />
+ </Target>
+ 
+</Project>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 4c42796908..18c37e6728 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -264,7 +264,9 @@
     <None Include="config\ClientDependency.Release.config">
       <DependentUpon>ClientDependency.config</DependentUpon>
     </None>
-    <Content Include="config\FileSystemProviders.config" />
+    <Content Include="config\FileSystemProviders.config">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="config\FileSystemProviders.Release.config">
       <DependentUpon>FileSystemProviders.config</DependentUpon>
     </Content>
diff --git a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
index bec7b9aff8..e6119df965 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
@@ -61,10 +61,14 @@
   
   <cc2:Pane runat="server">  
     <cc2:PropertyPanel ID="pp_icon" runat="server" Text="Icon">
-          <asp:DropDownList ID="ddlIcons"  CssClass="guiInputText guiInputStandardSize umbIconDropdownList" runat="server"/>
+        <div class="umbIconDropdownList">
+          <asp:DropDownList ID="ddlIcons"  CssClass="guiInputText guiInputStandardSize" runat="server"/>
+        </div>
     </cc2:PropertyPanel>
     <cc2:PropertyPanel ID="pp_thumbnail" runat="server" Text="Thumbnail">
+        <div class="umbThumbnailDropdownList">
           <asp:DropDownList ID="ddlThumbnails" CssClass="guiInputText guiInputStandardSize" runat="server"/>
+        </div>
     </cc2:PropertyPanel>
     <cc2:PropertyPanel ID="pp_description" runat="server" Text="Description">
           <asp:TextBox ID="description" runat="server" CssClass="guiInputText guiInputStandardSize" TextMode="MultiLine" Rows="3"/>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertTable.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/insertTable.aspx
index a00c055e93..3943cae364 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/insertTable.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/insertTable.aspx
@@ -284,7 +284,7 @@ function insertTable()
 		</TR></FORM>
 	</TABLE>
 	&nbsp;
-	<input type="button" class="guiInputButton" onClick="if (confirm('<%=umbraco.ui.Text("areyousure")%>')) window.close();" value="<%=umbraco.ui.Text("cancel")%>"> &nbsp; 
+	<input type="button" class="guiInputButton" onClick="if (confirm('<%=umbraco.ui.Text("areyousure").Replace("'", "\\'")%>')) window.close();" value="<%=umbraco.ui.Text("cancel")%>"> &nbsp; 
 	<input type="button" class="guiInputButton" onClick="insertTable()" value="<%=umbraco.ui.Text("insert")%>">
 	</body>
 </HTML>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx
index 1d77e27808..b402e89381 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx
@@ -20,7 +20,7 @@
 		}
 		
 		function showPublication() {
-		var statusStr = '<%=umbraco.ui.Text("inProgressCounter").Replace("'", "\\'")%>'; 
+	    var statusStr = '<%=umbraco.ui.Text("inProgressCounter").Replace("'", "\\'")%>'; 
 		  document.getElementById("counter").innerHTML = statusStr.replace('%0%', '0').replace('%1%', pubTotal);
 			document.getElementById('formDiv').style.display = 'none'; 
 			document.getElementById('animDiv').style.display = 'block'; 
@@ -37,7 +37,7 @@
 		}
 		
 		function updatePublicationDo(retVal) {
-		var statusStr = '<%=umbraco.ui.Text("inProgressCounter").Replace("'", "\\'")%>'; 
+		  var statusStr = '<%=umbraco.ui.Text("inProgressCounter").Replace("'", "\\'")%>'; 
 		  document.getElementById("counter").innerHTML = statusStr.replace('%0%', retVal).replace('%1%', pubTotal);
 			setTimeout("updatePublication()", 200);
 		}
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
index a2e281c90d..824634ee67 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
@@ -83,7 +83,7 @@
 
   <br />
   <p>
-    <input type="button" onclick="sort(); return false;" value='<%=umbraco.ui.Text("save") %>' />
+    <input type="button" onclick="sort(); return false;" value="<%=umbraco.ui.Text("save") %>" />
     <em> or </em><a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>  
   </p>
 </div>
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/default.Master b/src/Umbraco.Web.UI/umbraco/masterpages/default.Master
new file mode 100644
index 0000000000..45285fe986
--- /dev/null
+++ b/src/Umbraco.Web.UI/umbraco/masterpages/default.Master
@@ -0,0 +1,3 @@
+<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="default.master.cs" Inherits="umbraco.presentation.masterpages._default" %>
+<asp:ContentPlaceHolder ID="ContentPlaceHolderDefault" runat="server">
+</asp:ContentPlaceHolder>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
new file mode 100644
index 0000000000..9ef237a548
--- /dev/null
+++ b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
@@ -0,0 +1,35 @@
+<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="umbracoDialog.master.cs" Inherits="umbraco.presentation.masterpages.umbracoDialog" %>
+<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head id="Head1" runat="server">
+    <title></title>
+    
+    <cc1:UmbracoClientDependencyLoader runat="server" id="ClientLoader" />
+    
+    <!-- Default script and style -->
+	<umb:CssInclude ID="CssInclude1" runat="server" FilePath="ui/default.css" PathNameAlias="UmbracoClient" />
+     
+     <umb:JsInclude ID="JsInclude1" runat="server" FilePath="Application/NamespaceManager.js" PathNameAlias="UmbracoClient" Priority="0"  />     
+     <umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="1"  />
+     <umb:JsInclude ID="JsInclude4" runat="server" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient" Priority="2"  />
+     <umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient" Priority="5"  />     
+    
+    <asp:ContentPlaceHolder ID="head" runat="server"></asp:ContentPlaceHolder>
+</head>
+
+<body class="umbracoDialog" style="margin: 15px 10px 0px 10px;">
+    
+    
+    <form id="form1" runat="server">
+        <asp:ScriptManager ID="ScriptManager1" EnablePartialRendering="true" runat="server"></asp:ScriptManager>
+        <asp:ContentPlaceHolder ID="body" runat="server">
+        
+        </asp:ContentPlaceHolder>
+    </form>
+      
+    <asp:ContentPlaceHolder ID="footer" runat="server"></asp:ContentPlaceHolder>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master
new file mode 100644
index 0000000000..a8f60b9bbb
--- /dev/null
+++ b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master
@@ -0,0 +1,46 @@
+<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="umbracoPage.master.cs"
+    Inherits="umbraco.presentation.masterpages.umbracoPage" %>
+
+<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title></title>
+    <cc1:UmbracoClientDependencyLoader runat="server" ID="ClientLoader" />
+    <umb:CssInclude ID="CssInclude1" runat="server" FilePath="ui/default.css" PathNameAlias="UmbracoClient" />
+    <umb:CssInclude ID="CssInclude2" runat="server" FilePath="modal/style.css" PathNameAlias="UmbracoClient" />
+    <umb:JsInclude ID="JsInclude1" runat="server" FilePath="Application/NamespaceManager.js"
+        PathNameAlias="UmbracoClient" Priority="0" />
+    <umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient"
+        Priority="0" />
+    <umb:JsInclude ID="JsInclude8" runat="server" FilePath="ui/jqueryui.js" PathNameAlias="UmbracoClient"
+        Priority="1" />
+    <umb:JsInclude ID="JsInclude9" runat="server" FilePath="Application/jQuery/jquery.cookie.js"
+        PathNameAlias="UmbracoClient" Priority="1" />
+    <umb:JsInclude ID="JsInclude4" runat="server" FilePath="Application/UmbracoApplicationActions.js"
+        PathNameAlias="UmbracoClient" Priority="2" />
+    <umb:JsInclude ID="JsInclude5" runat="server" FilePath="Application/UmbracoUtils.js"
+        PathNameAlias="UmbracoClient" Priority="2" />
+    <umb:JsInclude ID="JsInclude6" runat="server" FilePath="Application/UmbracoClientManager.js"
+        PathNameAlias="UmbracoClient" Priority="3" />
+    <umb:JsInclude ID="JsInclude7" runat="server" FilePath="modal/modal.js" PathNameAlias="UmbracoClient"
+        Priority="10" />
+    <umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient"
+        Priority="10" />
+    <umb:JsInclude ID="JsIncludeHotkeys" runat="server" FilePath="Application/jQuery/jquery.hotkeys.js" PathNameAlias="UmbracoClient"
+        Priority="10" />
+    <asp:ContentPlaceHolder ID="head" runat="server">
+    </asp:ContentPlaceHolder>
+</head>
+<body class="umbracoPage">
+    <form id="form1" runat="server">
+    <asp:ScriptManager ID="ScriptManager1" EnablePartialRendering="true" runat="server">
+    </asp:ScriptManager>
+    <asp:ContentPlaceHolder ID="body" runat="server">
+    </asp:ContentPlaceHolder>
+    </form>
+    <asp:ContentPlaceHolder ID="footer" runat="server">
+    </asp:ContentPlaceHolder>
+</body>
+</html>
diff --git a/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertLink.aspx b/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertLink.aspx
index f656bf4504..1fd95d287d 100644
--- a/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertLink.aspx
+++ b/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertLink.aspx
@@ -106,9 +106,12 @@
       <ui:PropertyPanel ID="PropertyPanel2" runat="server" Text="Target">
           <div id="targetlistcontainer"></div>
       </ui:PropertyPanel>
+        
+      <div id="anchorlistrow">
       <ui:PropertyPanel ID="PropertyPanel3" runat="server" Text="Anchor">
           <div id="anchorlistcontainer"></div>
       </ui:PropertyPanel>
+      </div>
     </ui:Pane>
     
     <br /> 
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 981c0bd522..4447acaff1 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1874,7 +1874,9 @@
     <Content Include="umbraco.presentation\umbraco\developer\Python\editPython.aspx" />
     <Content Include="umbraco.presentation\umbraco\members\ViewMembers.aspx" />
     <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\insertImage.aspx" />
-    <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\insertLink.aspx" />
+    <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\insertLink.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\insertMacro.aspx" />
     <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
     <None Include="Web References\org.umbraco.update\UpgradeResult1.datasource">
@@ -1929,7 +1931,9 @@
     <Content Include="umbraco.presentation\umbraco\editContent.aspx" />
     <Content Include="umbraco.presentation\umbraco\editMedia.aspx" />
     <Content Include="umbraco.presentation\umbraco\js\language.aspx" />
-    <Content Include="umbraco.presentation\umbraco\login.aspx" />
+    <Content Include="umbraco.presentation\umbraco\login.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="umbraco.presentation\umbraco\logout.aspx" />
     <Content Include="umbraco.presentation\umbraco\macroResultWrapper.aspx">
       <SubType>Form</SubType>
@@ -2072,8 +2076,11 @@
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>xcopy /s /y "$(ProjectDir)umbraco.presentation\*.aspx" "$(ProjectDir)..\Umbraco.Web.UI\"
+xcopy /s /y "$(ProjectDir)umbraco.presentation\*.ascx" "$(ProjectDir)..\Umbraco.Web.UI\"
+xcopy /s /y "$(ProjectDir)umbraco.presentation\*.asmx" "$(ProjectDir)..\Umbraco.Web.UI\"
+xcopy /s /y "$(ProjectDir)umbraco.presentation\*.ashx" "$(ProjectDir)..\Umbraco.Web.UI\"
+xcopy /s /y "$(ProjectDir)umbraco.presentation\*.master" "$(ProjectDir)..\Umbraco.Web.UI\"</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx
index 08e5bf844b..4d7aa7a7d1 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx
@@ -6,7 +6,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" >
 <html>
 <head runat="server">
-    <title>Umbraco - login</title>
+    <title>Login - Umbraco - <%=Request.Url.Host.ToLower().Replace("www.", "") %></title>
     <cc1:UmbracoClientDependencyLoader runat="server" ID="ClientLoader" />
     <umb:CssInclude ID="CssInclude1" runat="server" FilePath="ui/default.css" PathNameAlias="UmbracoClient" />
     <umb:JsInclude ID="JsInclude1" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient" />