From 1bf9e40cc35432e4a14b93decffb54200b84fdaa Mon Sep 17 00:00:00 2001
From: me <devnull@localhost>
Date: Fri, 24 Apr 2015 19:03:00 +0400
Subject: [PATCH] wsp-10328 Vsp Aligment

---
 .../App_Data/ModulesData.config               |   2 +-
 .../App_Data/WebsitePanel_Modules.config      |  59 ++++----
 .../App_Data/WebsitePanel_Pages.config        |   6 +-
 .../WebsitePanel_Modules.ascx.resx            |  79 ++++++++++
 .../App_Themes/Default/Buttons.skin           |   3 +-
 .../App_Themes/Default/Icons/vps2012_48.png   | Bin 0 -> 242 bytes
 .../App_Themes/Default/Images.skin            |   2 +
 .../Default/Images/VPS2012/apply.png          | Bin 0 -> 313 bytes
 .../Default/Images/VPS2012/delete.png         | Bin 0 -> 271 bytes
 .../Default/Images/VPS2012/delete3.png        | Bin 0 -> 271 bytes
 .../Default/Images/VPS2012/delete4.png        | Bin 0 -> 271 bytes
 .../Default/Images/VPS2012/pause.png          | Bin 0 -> 284 bytes
 .../Default/Images/VPS2012/pause2.png         | Bin 0 -> 284 bytes
 .../Default/Images/VPS2012/pause3.png         | Bin 0 -> 284 bytes
 .../Default/Images/VPS2012/reboot.png         | Bin 0 -> 800 bytes
 .../Default/Images/VPS2012/rename.png         | Bin 0 -> 167 bytes
 .../Default/Images/VPS2012/reset.png          | Bin 0 -> 361 bytes
 .../Default/Images/VPS2012/reset2.png         | Bin 0 -> 361 bytes
 .../Default/Images/VPS2012/save.png           | Bin 0 -> 241 bytes
 .../Default/Images/VPS2012/server.png         | Bin 0 -> 163 bytes
 .../Default/Images/VPS2012/shutdown.png       | Bin 0 -> 247 bytes
 .../Default/Images/VPS2012/snapshot.png       | Bin 0 -> 373 bytes
 .../Default/Images/VPS2012/start.png          | Bin 0 -> 291 bytes
 .../Default/Images/VPS2012/start2.png         | Bin 0 -> 291 bytes
 .../Default/Images/VPS2012/stop.png           | Bin 0 -> 339 bytes
 .../Default/Images/VPS2012/turnoff.png        | Bin 0 -> 741 bytes
 .../App_Themes/Default/Styles/Skin.css        |   4 +
 .../App_LocalResources/VpsMenu.ascx.resx      | 138 ++++++++++++++++++
 .../VPS2012/VdcAddExternalAddress.ascx        |  19 ---
 .../VdcAddExternalAddress.ascx.designer.cs    |  36 -----
 .../WebsitePanel/VPS2012/VdcAuditLog.ascx     |  18 ---
 .../VPS2012/VdcAuditLog.ascx.designer.cs      |  36 -----
 .../WebsitePanel/VPS2012/VdcCreateServer.ascx |  17 ---
 .../VPS2012/VdcCreateServer.ascx.designer.cs  |  36 -----
 .../VPS2012/VdcExternalNetwork.ascx           |  18 ---
 .../VdcExternalNetwork.ascx.designer.cs       |  36 -----
 .../WebsitePanel/VPS2012/VdcHome.ascx         |  22 +--
 .../VPS2012/VdcHome.ascx.designer.cs          |  36 -----
 .../WebsitePanel/VPS2012/VdcImportServer.ascx |  17 ---
 .../VPS2012/VdcImportServer.ascx.designer.cs  |  36 -----
 .../VPS2012/VdcManagementNetwork.ascx         |  21 ---
 .../VdcManagementNetwork.ascx.designer.cs     |  36 -----
 .../WebsitePanel/VPS2012/VdcPermissions.ascx  |  18 ---
 .../VPS2012/VdcPermissions.ascx.designer.cs   |  36 -----
 .../VPS2012/VdcPrivateNetwork.ascx            |  19 ---
 .../VdcPrivateNetwork.ascx.designer.cs        |  36 -----
 .../VPS2012/VpsDetailsAddExternalAddress.ascx |  18 ---
 ...DetailsAddExternalAddress.ascx.designer.cs |  36 -----
 .../VPS2012/VpsDetailsAddPrivateAddress.ascx  |  18 ---
 ...sDetailsAddPrivateAddress.ascx.designer.cs |  36 -----
 .../VPS2012/VpsDetailsAuditLog.ascx           |  18 ---
 .../VpsDetailsAuditLog.ascx.designer.cs       |  36 -----
 .../VPS2012/VpsDetailsConfiguration.ascx      |  18 ---
 .../VpsDetailsConfiguration.ascx.designer.cs  |  36 -----
 .../WebsitePanel/VPS2012/VpsDetailsDvd.ascx   |  18 ---
 .../VPS2012/VpsDetailsDvd.ascx.designer.cs    |  36 -----
 .../VPS2012/VpsDetailsEditConfiguration.ascx  |  18 ---
 ...sDetailsEditConfiguration.ascx.designer.cs |  36 -----
 .../VPS2012/VpsDetailsGeneral.ascx            |  17 ---
 .../VPS2012/VpsDetailsGeneral.ascx.cs         |   2 +-
 .../VpsDetailsGeneral.ascx.designer.cs        |  36 -----
 .../WebsitePanel/VPS2012/VpsDetailsHelp.ascx  |  18 ---
 .../VPS2012/VpsDetailsHelp.ascx.designer.cs   |  36 -----
 .../VPS2012/VpsDetailsInsertDvd.ascx          |  18 ---
 .../VpsDetailsInsertDvd.ascx.designer.cs      |  36 -----
 .../VPS2012/VpsDetailsNetwork.ascx            |  17 ---
 .../VpsDetailsNetwork.ascx.designer.cs        |  36 -----
 .../VPS2012/VpsDetailsPermissions.ascx        |  18 ---
 .../VpsDetailsPermissions.ascx.designer.cs    |  36 -----
 .../VPS2012/VpsDetailsReplications.ascx       |  14 --
 .../VpsDetailsReplications.ascx.designer.cs   |  18 ---
 .../VPS2012/VpsDetailsSnapshots.ascx          |  27 +---
 .../VPS2012/VpsDetailsSnapshots.ascx.cs       |   4 +-
 .../VpsDetailsSnapshots.ascx.designer.cs      |  36 -----
 .../WebsitePanel/VPS2012/VpsDetailsTools.ascx |  18 ---
 .../VPS2012/VpsDetailsTools.ascx.designer.cs  |  36 -----
 .../WebsitePanel/VPS2012/VpsMoveServer.ascx   |  18 ---
 .../VPS2012/VpsMoveServer.ascx.designer.cs    |  36 -----
 .../VPS2012/VpsToolsDeleteServer.ascx         |  15 --
 .../VpsToolsDeleteServer.ascx.designer.cs     |  36 -----
 .../VPS2012/VpsToolsReinstallServer.ascx      |  18 ---
 .../VpsToolsReinstallServer.ascx.designer.cs  |  36 -----
 .../DesktopModules/WebsitePanel/VpsMenu.ascx  |  11 ++
 .../WebsitePanel/VpsMenu.ascx.cs              | 137 +++++++++++++++++
 .../WebsitePanel/VpsMenu.ascx.designer.cs     |  42 ++++++
 .../WebsitePanel.Portal.Modules.csproj        |  14 ++
 86 files changed, 477 insertions(+), 1419 deletions(-)
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/vps2012_48.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/apply.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/delete.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/delete3.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/delete4.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/pause.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/pause2.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/pause3.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/reboot.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/rename.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/reset.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/reset2.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/save.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/server.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/shutdown.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/snapshot.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/start.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/start2.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/stop.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/turnoff.png
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/VpsMenu.ascx.resx
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VpsMenu.ascx
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VpsMenu.ascx.cs
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VpsMenu.ascx.designer.cs

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
index 6a632d9b..e841aa86 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
@@ -124,7 +124,7 @@
     </Group>
     <Group pageID="SpaceHome" titleresourcekey="VPS" disabled="True">
       <Icon pageID="SpaceVPS" resourceGroup="VPS" imageUrl="icons/vps_48.png" />
-      <Icon pageID="SpaceVPS2012" resourceGroup="VPS2012" imageUrl="icons/vps_48.png" />
+      <Icon pageID="SpaceVPS2012" resourceGroup="VPS2012" imageUrl="icons/vps2012_48.png" />
       <Icon pageID="SpaceVPSForPC" resourceGroup="VPSForPC" imageUrl="icons/vpsforpc_48.png" />
     </Group>
     <!-- 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
index df5887ee..1030592f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
@@ -645,33 +645,33 @@
 
 	<ModuleDefinition id="VPS2012">
 		<Controls>
-			<Control key="" src="WebsitePanel/VPS2012/VdcHome.ascx" title="VdcHome" type="View" />
-			<Control key="vdc_create_server" src="WebsitePanel/VPS2012/VdcCreateServer.ascx" title="VdcCreateServer" type="View" />
-      <Control key="vdc_import_server" src="WebsitePanel/VPS2012/VdcImportServer.ascx" title="VdcImportServer" type="View" />
-			<Control key="vdc_external_network" src="WebsitePanel/VPS2012/VdcExternalNetwork.ascx" title="VdcExternalNetwork" type="View" />
-			<Control key="vdc_management_network" src="WebsitePanel/VPS2012/VdcManagementNetwork.ascx" title="VdcManagementNetwork" type="View" />
-			<Control key="vdc_allocate_external_ip" src="WebsitePanel/VPS2012/VdcAddExternalAddress.ascx" title="VdcAddExternalAddress" type="View" />
-			<Control key="vdc_private_network" src="WebsitePanel/VPS2012/VdcPrivateNetwork.ascx" title="VdcPrivateNetwork" type="View" />
-			<Control key="vdc_permissions" src="WebsitePanel/VPS2012/VdcPermissions.ascx" title="VdcPermissions" type="View" />
-			<Control key="vdc_audit_log" src="WebsitePanel/VPS2012/VdcAuditLog.ascx" title="VdcAuditLog" type="View" />
+			<Control key="" src="WebsitePanel/VPS2012/VdcHome.ascx" title="VdcHome" type="View" icon="vps2012_48.png" />
+			<Control key="vdc_create_server" src="WebsitePanel/VPS2012/VdcCreateServer.ascx" title="VdcCreateServer" type="View" icon="vps2012_48.png"  />
+      <Control key="vdc_import_server" src="WebsitePanel/VPS2012/VdcImportServer.ascx" title="VdcImportServer" type="View" icon="vps2012_48.png"  />
+			<Control key="vdc_external_network" src="WebsitePanel/VPS2012/VdcExternalNetwork.ascx" title="VdcExternalNetwork" type="View" icon="vps2012_48.png" />
+			<Control key="vdc_management_network" src="WebsitePanel/VPS2012/VdcManagementNetwork.ascx" title="VdcManagementNetwork" type="View" icon="vps2012_48.png" />
+			<Control key="vdc_allocate_external_ip" src="WebsitePanel/VPS2012/VdcAddExternalAddress.ascx" title="VdcAddExternalAddress" type="View" icon="vps2012_48.png" />
+			<Control key="vdc_private_network" src="WebsitePanel/VPS2012/VdcPrivateNetwork.ascx" title="VdcPrivateNetwork" type="View" icon="vps2012_48.png" />
+			<Control key="vdc_permissions" src="WebsitePanel/VPS2012/VdcPermissions.ascx" title="VdcPermissions" type="View" icon="vps2012_48.png" />
+			<Control key="vdc_audit_log" src="WebsitePanel/VPS2012/VdcAuditLog.ascx" title="VdcAuditLog" type="View" icon="vps2012_48.png" />
 
-			<Control key="vps_general" src="WebsitePanel/VPS2012/VpsDetailsGeneral.ascx" title="VpsDetailsGeneral" type="View" />
-			<Control key="vps_config" src="WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx" title="VpsDetailsConfiguration" type="View" />
-			<Control key="vps_edit_config" src="WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx" title="VpsDetailsEditConfiguration" type="View" />
-			<Control key="vps_dvd" src="WebsitePanel/VPS2012/VpsDetailsDvd.ascx" title="VpsDetailsDvd" type="View" />
-			<Control key="vps_insert_dvd" src="WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx" title="VpsDetailsInsertDvd" type="View" />
-			<Control key="vps_snapshots" src="WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx" title="VpsDetailsSnapshots" type="View" />
-			<Control key="vps_replication" src="WebsitePanel/VPS2012/VpsDetailsReplications.ascx" title="VpsDetailReplications" type="View" />
-			<Control key="vps_network" src="WebsitePanel/VPS2012/VpsDetailsNetwork.ascx" title="VpsDetailsNetwork" type="View" />
-			<Control key="vps_add_external_ip" src="WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx" title="VpsDetailsAddExternalAddress" type="View" />
-			<Control key="vps_add_private_ip" src="WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx" title="VpsDetailsAddPrivateAddress" type="View" />
-			<Control key="vps_permissions" src="WebsitePanel/VPS2012/VpsDetailsPermissions.ascx" title="VpsDetailsNetworking" type="View" />
-			<Control key="vps_tools" src="WebsitePanel/VPS2012/VpsDetailsTools.ascx" title="VpsDetailsTools" type="View" />
-			<Control key="vps_audit_log" src="WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx" title="VpsDetailsAuditLog" type="View" />
-			<Control key="vps_help" src="WebsitePanel/VPS2012/VpsDetailsHelp.ascx" title="VpsDetailsHelp" type="View" />
-			<Control key="vps_tools_delete" src="WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx" title="VpsToolsDeleteServer" type="View" />
-      <Control key="vps_tools_move" src="WebsitePanel/VPS2012/VpsMoveServer.ascx" title="VpsMoveServer" type="View" />
-			<Control key="vps_tools_reinstall" src="WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx" title="VpsToolsReinstallServer" type="View" />
+			<Control key="vps_general" src="WebsitePanel/VPS2012/VpsDetailsGeneral.ascx" title="VpsDetailsGeneral" type="View" icon="vps2012_48.png"/>
+			<Control key="vps_config" src="WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx" title="VpsDetailsConfiguration" type="View" icon="vps2012_48.png" />
+			<Control key="vps_edit_config" src="WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx" title="VpsDetailsEditConfiguration" type="View" icon="vps2012_48.png" />
+			<Control key="vps_dvd" src="WebsitePanel/VPS2012/VpsDetailsDvd.ascx" title="VpsDetailsDvd" type="View" icon="vps2012_48.png" />
+			<Control key="vps_insert_dvd" src="WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx" title="VpsDetailsInsertDvd" type="View" icon="vps2012_48.png" />
+			<Control key="vps_snapshots" src="WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx" title="VpsDetailsSnapshots" type="View" icon="vps2012_48.png" />
+			<Control key="vps_replication" src="WebsitePanel/VPS2012/VpsDetailsReplications.ascx" title="VpsDetailReplications" type="View" icon="vps2012_48.png" />
+			<Control key="vps_network" src="WebsitePanel/VPS2012/VpsDetailsNetwork.ascx" title="VpsDetailsNetwork" type="View" icon="vps2012_48.png" />
+			<Control key="vps_add_external_ip" src="WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx" title="VpsDetailsAddExternalAddress" type="View" icon="vps2012_48.png" />
+			<Control key="vps_add_private_ip" src="WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx" title="VpsDetailsAddPrivateAddress" type="View" icon="vps2012_48.png" />
+			<Control key="vps_permissions" src="WebsitePanel/VPS2012/VpsDetailsPermissions.ascx" title="VpsDetailsNetworking" type="View" icon="vps2012_48.png" />
+			<Control key="vps_tools" src="WebsitePanel/VPS2012/VpsDetailsTools.ascx" title="VpsDetailsTools" type="View" icon="vps2012_48.png" />
+			<Control key="vps_audit_log" src="WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx" title="VpsDetailsAuditLog" type="View" icon="vps2012_48.png" />
+			<Control key="vps_help" src="WebsitePanel/VPS2012/VpsDetailsHelp.ascx" title="VpsDetailsHelp" type="View" icon="vps2012_48.png" />
+			<Control key="vps_tools_delete" src="WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx" title="VpsToolsDeleteServer" type="View" icon="vps2012_48.png" />
+      <Control key="vps_tools_move" src="WebsitePanel/VPS2012/VpsMoveServer.ascx" title="VpsMoveServer" type="View" icon="vps2012_48.png" />
+			<Control key="vps_tools_reinstall" src="WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx" title="VpsToolsReinstallServer" type="View" icon="vps2012_48.png" />
 		</Controls>
 	</ModuleDefinition>
 
@@ -728,4 +728,11 @@
       <Control key="" src="WebsitePanel/OrganizationMenu.ascx" title="OrganizationMenu" type="View" />
     </Controls>
   </ModuleDefinition>
+  
+  <!-- Virtual Personal Servers -->
+  <ModuleDefinition id="VpsMenu">
+    <Controls>
+      <Control key="" src="WebsitePanel/VpsMenu.ascx" title="VpsMenu" type="View" />
+    </Controls>
+  </ModuleDefinition>
 </ModuleDefinitions>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config
index 23692e45..7a9d1fe3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config
@@ -652,7 +652,7 @@
     </Content>
   </Page>
 
-  <Page name="SpaceVPS2012" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="VPS.ascx" adminskin="VPS.ascx">
+  <Page name="SpaceVPS2012" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
     <Content id="LeftPane">
       <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
         <ModuleData ref="UserMenu"/>
@@ -660,9 +660,11 @@
       <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
         <ModuleData ref="SpaceMenu"/>
       </Module>
+      <Module moduleDefinitionID="VpsMenu" title="VpsMenu" container="Clear.ascx">
+      </Module>
     </Content>
     <Content id="ContentPane">
-      <Module moduleDefinitionID="VPS2012" title="VirtualPrivateServers2012" icon="" container="VPS2012.ascx" admincontainer="VPS2012.ascx" readOnlyRoles="PlatformCSR,ResellerCSR"/>
+      <Module moduleDefinitionID="VPS2012" title="VirtualPrivateServers2012" icon="vps2012_48.png" readOnlyRoles="PlatformCSR,ResellerCSR"/>
     </Content>
   </Page>
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Modules.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Modules.ascx.resx
index 08aa99a4..64026b9b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Modules.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Modules.ascx.resx
@@ -813,4 +813,83 @@
   <data name="ModuleTitle.RDSServersEditServer" xml:space="preserve">
     <value>Edit RDS Server</value>
   </data>
+  
+  <data name="ModuleTitle.VirtualPrivateServers2012" xml:space="preserve">
+    <value>Virtual Private Servers</value>
+  </data>
+  <data name="ModuleTitle.VdcCreateServer" xml:space="preserve">
+    <value>Create New VPS</value>
+  </data>
+  <data name="ModuleTitle.VdcImportServer" xml:space="preserve">
+    <value>Import VPS</value>
+  </data>
+  <data name="ModuleTitle.VdcExternalNetwork" xml:space="preserve">
+    <value>External Network</value>
+  </data>
+  <data name="ModuleTitle.VdcManagementNetwork" xml:space="preserve">
+    <value>Management Network</value>
+  </data>
+  <data name="ModuleTitle.VdcAddExternalAddress" xml:space="preserve">
+    <value>Allocate IP Addresses</value>
+  </data>
+  <data name="ModuleTitle.VdcPrivateNetwork" xml:space="preserve">
+    <value>Private Network</value>
+  </data>
+  <data name="ModuleTitle.VdcPermissions" xml:space="preserve">
+    <value>User Permissions</value>
+  </data>
+  <data name="ModuleTitle.VdcAuditLog" xml:space="preserve">
+    <value>Audit Log</value>
+  </data>
+  <data name="ModuleTitle.VpsDetailsGeneral" xml:space="preserve">
+    <value>General</value>
+  </data>
+  <data name="ModuleTitle.VpsDetailsConfiguration" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="ModuleTitle.VpsDetailsEditConfiguration" xml:space="preserve">
+    <value>Edit Configuration</value>
+  </data>
+  <data name="ModuleTitle.VpsDetailsDvd" xml:space="preserve">
+    <value>DVD</value>
+  </data>
+  <data name="ModuleTitle.VpsDetailsInsertDvd" xml:space="preserve">
+    <value>DVD</value>
+  </data>
+  <data name="ModuleTitle.VpsDetailsSnapshots" xml:space="preserve">
+    <value>Snapshots</value>
+  </data>
+  <data name="ModuleTitle.VpsDetailReplications" xml:space="preserve">
+    <value>Replication</value>
+  </data>
+  <data name="ModuleTitle.VpsDetailsNetwork" xml:space="preserve">
+    <value>Network</value>
+  </data>
+  <data name="ModuleTitle.VpsDetailsAddExternalAddress" xml:space="preserve">
+    <value>Network</value>
+  </data>
+  <data name="ModuleTitle.VpsDetailsAddPrivateAddress" xml:space="preserve">
+    <value>Network</value>
+  </data>
+  <data name="ModuleTitle.VpsDetailsNetworking" xml:space="preserve">
+    <value>Permissions</value>
+  </data>
+  <data name="ModuleTitle.VpsDetailsTools" xml:space="preserve">
+    <value>Tools</value>
+  </data>
+  <data name="ModuleTitle.VpsDetailsAuditLog" xml:space="preserve">
+    <value>Audit Log</value>
+  </data>
+  <data name="ModuleTitle.VpsDetailsHelp" xml:space="preserve">
+    <value>Help</value>
+  </data>
+  <data name="ModuleTitle.VpsToolsDeleteServer" xml:space="preserve">
+    <value>Delete Server</value>
+  </data>
+  <data name="ModuleTitle.VpsMoveServer" xml:space="preserve">
+    <value>Move VPS</value>
+  </data>
+  <data name="ModuleTitle.VpsToolsReinstallServer" xml:space="preserve">
+    <value>Re-install Server</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Buttons.skin b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Buttons.skin
index ffaaaff6..f9ec20e2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Buttons.skin
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Buttons.skin
@@ -41,4 +41,5 @@ Default skin template. The following skins are provided as examples only.
 <asp:ImageButton SkinID="ApplySmall" runat="server" ImageUrl="Images/apply_16.png" ImageAlign="AbsMiddle" Width="16" Height="16"/>
 
 
-<asp:ImageButton SkinID="VpsDelete" runat="server" ImageUrl="Images/VPS/delete.png" ImageAlign="AbsMiddle"  Width="16" Height="16"/>
\ No newline at end of file
+<asp:ImageButton SkinID="VpsDelete" runat="server" ImageUrl="Images/VPS/delete.png" ImageAlign="AbsMiddle"  Width="16" Height="16"/>
+<asp:ImageButton SkinID="VpsDelete2012" runat="server" ImageUrl="Images/VPS2012/delete.png" ImageAlign="AbsMiddle"  Width="16" Height="16"/>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/vps2012_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/vps2012_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..1898391d658f36ac963434446490259e38fa73b5
GIT binary patch
literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GQ#@T9Ln>~)x#h^!pdjKJ*t_l7s@OSK7c5-xr(?<IV@ftV
z{%d9AtzCL?O3*QJ_Mq&ui?g?HsSpWJm|<&`@jStu-AsjpL$~`vaJrL-BgaMoZXj~(
zXjM4kB#@*i21HE|{*neJZng7!g8U+uY|nfrn<5b8(6~SP#oBrS|EK%TIlnMwP20Dl
ghIPJnI|DPri&W2hdhedh2fB~J)78&qol`;+05X7AdH?_b

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images.skin b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images.skin
index 203410e3..da7a753f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images.skin
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images.skin
@@ -44,6 +44,8 @@ Default skin template. The following skins are provided as examples only.
 
 <asp:Image runat="server" SkinID="OptionEnabled" ImageUrl="images/Exchange/checkbox.png" ImageAlign="AbsMiddle" Width="16" Height="16" />
 <asp:Image runat="server" SkinID="OptionDisabled" ImageUrl="images/VPS/delete.png" ImageAlign="AbsMiddle" Width="16" Height="16" />
+<asp:Image runat="server" SkinID="OptionDisabled2012" ImageUrl="images/VPS2012/delete.png" ImageAlign="AbsMiddle" Width="16" Height="16" />
 
 <asp:Image runat="server" SkinID="Vps16" ImageUrl="images/VPS/server.png" ImageAlign="AbsMiddle" Width="16" Height="16" />
+<asp:Image runat="server" SkinID="Vps2012_16" ImageUrl="images/VPS2012/server.png" ImageAlign="AbsMiddle" Width="16" Height="16" />
 <asp:Image runat="server" SkinID="Rdc16" ImageUrl="images/VPS/rdc16.png" ImageAlign="AbsMiddle" Width="16" Height="16" />
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/apply.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/apply.png
new file mode 100644
index 0000000000000000000000000000000000000000..24176caaa44d3a09aefff71e9a2b376832d1b1c7
GIT binary patch
literal 313
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
za0`PlBg3pY5<tP*o-U3d7QI(5?e=PR6kvVuUVOC(qkd>lf^fIOk!wNO@(0{GGq@D_
zCuqg~Vrg3YAlgMGOi9d4sY4-i&(ae@)1JoXem!u&Xmk3xIX9o)Uwq<;^os?PR-P~D
z+dXwjfUA74%wuKYc8k`l9eaAca~`qrTb%SU@LPWScyho!PVs&9oryLFC9`fE_U?Qn
z9<*EKWT1lh4PLEanTJ-%OSimcdzG=c^>>2y(dZn-W5(AG@9fm>J{$kQR;j$0mupR=
zO)~%XhcVk`tDf5Sue0$_deo|ejN2Cd(N?SY)%nNVfPL09vroUT%6tHNlfl!~&t;uc
GLK6TCW_soT

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/delete.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef03d2b1bc74b54723372dc7c6475a0ed4f2d05f
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XHhQ`^hE&{2N?0IZ@JPU%;ZdE*#!iPljT0CRdYJ<LFlhCi
z(Pw$Yy@Tfl{}Jhlq6r%h$alylGU;S+IY>QT*tLOif;OK3S2L5sHTFmC5qlK)k93~s
znz>Qp0OOG+54~RuN1i$S5q`Co9Vpn*v$lVS$_7b>O;_c*ci8QEyMyOPgE~W}5d)i?
z!(!f>3~Wif4L8*oOrJ37P2c#yfMLlE#*Uv0BO2!HQD``Nft#n9kAX#k;l)Jx0!_tb
R4M4{;c)I$ztaD0e0sxcVVI2Sf

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/delete3.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/delete3.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef03d2b1bc74b54723372dc7c6475a0ed4f2d05f
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XHhQ`^hE&{2N?0IZ@JPU%;ZdE*#!iPljT0CRdYJ<LFlhCi
z(Pw$Yy@Tfl{}Jhlq6r%h$alylGU;S+IY>QT*tLOif;OK3S2L5sHTFmC5qlK)k93~s
znz>Qp0OOG+54~RuN1i$S5q`Co9Vpn*v$lVS$_7b>O;_c*ci8QEyMyOPgE~W}5d)i?
z!(!f>3~Wif4L8*oOrJ37P2c#yfMLlE#*Uv0BO2!HQD``Nft#n9kAX#k;l)Jx0!_tb
R4M4{;c)I$ztaD0e0sxcVVI2Sf

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/delete4.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/delete4.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef03d2b1bc74b54723372dc7c6475a0ed4f2d05f
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XHhQ`^hE&{2N?0IZ@JPU%;ZdE*#!iPljT0CRdYJ<LFlhCi
z(Pw$Yy@Tfl{}Jhlq6r%h$alylGU;S+IY>QT*tLOif;OK3S2L5sHTFmC5qlK)k93~s
znz>Qp0OOG+54~RuN1i$S5q`Co9Vpn*v$lVS$_7b>O;_c*ci8QEyMyOPgE~W}5d)i?
z!(!f>3~Wif4L8*oOrJ37P2c#yfMLlE#*Uv0BO2!HQD``Nft#n9kAX#k;l)Jx0!_tb
R4M4{;c)I$ztaD0e0sxcVVI2Sf

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/pause.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/pause.png
new file mode 100644
index 0000000000000000000000000000000000000000..1408ce70a2e7d2e952f58aaa53f4afd0be5f0f72
GIT binary patch
literal 284
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X_IbKEhE&{I5**0eV!)Fd(7>YN!^Ag(Rir?uz#yPN%z@D&
z!B6dB#^mcM2cGuzPT$kNwKo6mC85~F8TrqS{b`U+YO7n2vdiOwarTCO9@#AYBux&V
z?#-5^p-SQb)dqzgD?IXI7X4|OF^e^0g~NlRIWy<|JG?l|#Er*_MSWL4=PW<#8Je=2
z%M{qM+YYW`>koLKTiO<86307>r`e6y?N76>Ky-%N+k_p)ub0P4KHB-y>{RF}4g0ud
eZ%Xg6N-&)Ev8k2v%qju;gu&C*&t;ucLK6T9s%WqP

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/pause2.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/pause2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1408ce70a2e7d2e952f58aaa53f4afd0be5f0f72
GIT binary patch
literal 284
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X_IbKEhE&{I5**0eV!)Fd(7>YN!^Ag(Rir?uz#yPN%z@D&
z!B6dB#^mcM2cGuzPT$kNwKo6mC85~F8TrqS{b`U+YO7n2vdiOwarTCO9@#AYBux&V
z?#-5^p-SQb)dqzgD?IXI7X4|OF^e^0g~NlRIWy<|JG?l|#Er*_MSWL4=PW<#8Je=2
z%M{qM+YYW`>koLKTiO<86307>r`e6y?N76>Ky-%N+k_p)ub0P4KHB-y>{RF}4g0ud
eZ%Xg6N-&)Ev8k2v%qju;gu&C*&t;ucLK6T9s%WqP

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/pause3.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/pause3.png
new file mode 100644
index 0000000000000000000000000000000000000000..1408ce70a2e7d2e952f58aaa53f4afd0be5f0f72
GIT binary patch
literal 284
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X_IbKEhE&{I5**0eV!)Fd(7>YN!^Ag(Rir?uz#yPN%z@D&
z!B6dB#^mcM2cGuzPT$kNwKo6mC85~F8TrqS{b`U+YO7n2vdiOwarTCO9@#AYBux&V
z?#-5^p-SQb)dqzgD?IXI7X4|OF^e^0g~NlRIWy<|JG?l|#Er*_MSWL4=PW<#8Je=2
z%M{qM+YYW`>koLKTiO<86307>r`e6y?N76>Ky-%N+k_p)ub0P4KHB-y>{RF}4g0ud
eZ%Xg6N-&)Ev8k2v%qju;gu&C*&t;ucLK6T9s%WqP

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/reboot.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/reboot.png
new file mode 100644
index 0000000000000000000000000000000000000000..77e12d1c6acb7ad8defd5410e695d603097fba04
GIT binary patch
literal 800
zcmV+*1K<3KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!!bwCyRCwBSQcFlwVH7_1zmK_h?j4#5
zBoWL-IO;e#4|Em<N!nOqgjqSGHHsS-fdoZ`m=DIxRYkj8MMkx29k_{TWoigD84=Qe
zi&>;XHLv^X{MWe`Tlinj{a@#N-#PzxnA+M}IA}100Yb>4X_(gy!}zoRE}P9-Gcn=d
zkLP%hWjQ4)@@JM~+i8G(XAfenZNtG5HYNzd8%dOYyWMWn<M9AmouVl3c!7V&FpRJ-
z9yrr9?Q{iXoRZwqxXa}t2m&0(0nhV$z${DmH}ik<UBzNCfkzn!0P6%%6rW0xG$OlY
zKqe~y*&HScNcW*|sP0PtWsj4A_2ak>OnF3+72tRd!jUi}2NK|K@I&8)OF&qx6p4}p
zNk|SR-ebsy13*!0YHDW7YT0sZYHEb3naQ_!H+||v`?BIuOy6N2+`4@WqS457TO^h)
zm&>rVwN(K?sZ?EUrDdq93cY>3t8LL(cd1me(hdXzFq59yt*$=OA8Cm$X{rYHyV)7A
z#X?cQ`YiyT&v&O(EP<};pb-roKY8>C?|NIBLs@#ZUja+Twe?j%i2xe~G);pCbMras
zNLeT#2A>Qz9?$BUE+N?{W;%*<!T|^c!+O2HUZuelWOH+K)@l_5FmwZ&>H`IOjtzBJ
zbcqY1Brc%;m;*rB&UK$%qceTbLcVYjRapQA4pnLuP|^uxzK1<R<%Y2vWBLC8;$88{
zGx1JGZ<KTtn`sx<KLwXiLe~4(8!YXOp7TA>(Rn)UJR(iAxgof;y1uelRaG_g>g8*|
zAi&<IWgMkh(LicfuMI+KIQ0zuKjd<`y$<&Jyg(QN-+pWexSz^=$&4>Pe?eA0t^n1W
zX4Kl&3PZywBhVa}N1wF+SVMXH*LDTK>)l&an7)3`#Be)-7DtoN3TR7cbNHakwn95Q
eJ67C30R{j{$`Q#a2a=)y0000<MNUMnLSTZJFJgcI

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/rename.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/rename.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e0178d05a45688aeb0ee98ff09d96a0124ef847
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`d7dtgAr*0NFB)<kHsEP}C~vym
zr?z{VU!#tsQOP&ftg6$`n>rnv6=tma>9EIDh^eq~N)YQIt)(tESDlr8HFLpo{iH`5
z*2^oc|LXVs-ad~<JI|CHYtSk*K5We9d1&^ZmFaS)ZN9b6DW36<`~U6_%oh(9o?rC$
Rlqb+;22WQ%mvv4FO#l|(MBV@Z

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/reset.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/reset.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7a4af2b0adf0a2c132aa16b04e335b5a03586bd
GIT binary patch
literal 361
zcmV-v0ha!WP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkP3rR#lR5*>5(!DMOQ5Xi`XJ!?<5>e@N
zD!*CoK&y}~T!DhhCAbS=S&?ia+h|m)k?bvqL`A95>Mg~YiE(z$;_YVMpL5>xeVIvY
z;SfvsDE>9@f-W9vJYW_*Tw%3_Uq`<PY1NtUu#-x!V7Jiz2<iRNT%v<B$c4@g3?tDo
zRuTcXm_r-RO?IBgGu~>r5}P=M`-EWemyisj-1n$rykZ;g7-22qKQYb|=4wa}3ph%N
zQWanyW87dS;<Dmqy26tD$4r>s31Jld8o}ihGYqg%esqNmt0JFb-YZWp(Gu3PlQ6{Q
zA(}DKDsFNuEJ;@3GNJRJIJsFRVzhC9W#JJCb)Im6$Ex@Xhh;HNe(xx(00000NkvXX
Hu0mjf`<;>#

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/reset2.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/reset2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7a4af2b0adf0a2c132aa16b04e335b5a03586bd
GIT binary patch
literal 361
zcmV-v0ha!WP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkP3rR#lR5*>5(!DMOQ5Xi`XJ!?<5>e@N
zD!*CoK&y}~T!DhhCAbS=S&?ia+h|m)k?bvqL`A95>Mg~YiE(z$;_YVMpL5>xeVIvY
z;SfvsDE>9@f-W9vJYW_*Tw%3_Uq`<PY1NtUu#-x!V7Jiz2<iRNT%v<B$c4@g3?tDo
zRuTcXm_r-RO?IBgGu~>r5}P=M`-EWemyisj-1n$rykZ;g7-22qKQYb|=4wa}3ph%N
zQWanyW87dS;<Dmqy26tD$4r>s31Jld8o}ihGYqg%esqNmt0JFb-YZWp(Gu3PlQ6{Q
zA(}DKDsFNuEJ;@3GNJRJIJsFRVzhC9W#JJCb)Im6$Ex@Xhh;HNe(xx(00000NkvXX
Hu0mjf`<;>#

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/save.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/save.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9e71c6da7640e9513137bd31a73a87b594d86dc
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
za0`PlBg3pY5<tPpo-U3d7QIg|8*&|T5NLhKZ>YI<a%+0PMq!rMa}Io#*zhf)i(`>f
zj+vB?nIfaMyw2@C-_P?L{*avd(AD%EgU>Flo?lx&t2gLQ604W82|U2_n?uF5FH<_9
zaS>xs+xrMpMze?Y333XRtecMUdfV(bYH<kV<lB*S-Qb+H@NK7?Ck2;xEcbi8vgy2T
h44cC_=B{gBnU>v`3Y9TCo&$6qgQu&X%Q~loCIHLqQD6W7

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/server.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/server.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5aee7da55302e0920c7e300ea9b229006f6c801
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XTs>VJLn>}1{rUgjo>{elHTJ;OtD@^WcbC6UJCe;{=K6yt
zT`^4YVw^<j!HyC}VdmBb!T7YMoh;L*uXxTB^ruJe1_L7-gYi@&!#~$F7XS@p@O1Ta
JS?83{1OR!~HdX)t

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/shutdown.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/shutdown.png
new file mode 100644
index 0000000000000000000000000000000000000000..45546fde0bbf547db98e3a774f167e91afb0af35
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XW_r3fhE&{I6WqvqKtN!La7jyF5{vSUGa7CNO?e3{wP!u|
zxn6!Sx%<iczW?nae=Qnh)IVtRC<-VYWE8agoO*{-?gDRIbMb|+iJZ5UZz_u2T9w1!
z_-lp3MlbodENQ2*t2lXzVuXKeNnX5YQ)gz5#)F;to?EMuj$N5q_icr*PRC2JW$inj
tNU=^j%)fF%-ZM@9S~bhxbM+b77zBUYf1FeG;U3VD44$rjF6*2UngHG4Unc+n

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/snapshot.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/snapshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ffc122b5e487e0ef0df1906030d24df0942f171
GIT binary patch
literal 373
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~i!3HGN^yhQ|DVAa<&kznEsNqQI0P;BtJR*x3
z7`TN&n2}-D90>*nMsZIU#}JK)y_fcDw<e0Pe>lIlwMBZDXIQi6PhlPvd#>h_CB_jt
zf0(_}xVa~$D0r3|X$Gc6ili=j@?1gn$?*^S!q;E_eXr*AOUvig^WInbJ(u~X)SW0&
z*z9lfkR$knYDV3KCgwfK!mM8sSc-QXHr+Mpi0_UAoVS!}>W{2D?DfMj-^NieJ)`5}
zZA1I!R2zkOCF>7UgQ9F0uRIbnjx1?gDt_qFzvlFu1cUA{$LZnD)|^v0@2rp0O*C}9
z(;Lfk^oQY|DRWkRShA35@(r%s8OIAHeU(-nwr;QXac|yiAtLF^WfUQ-6Pj!?;kc#W
z#d%8Wj$7SZl9O!w?L(t%Pcp;ehy%*&SQhI?C(U1wIK4tN=dPVvfN<>}-rXB5czOH0
Rm4M;K;OXk;vd$@?2>_C1jLrZ6

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/start.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/start.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b3e3a08d6dd55185656c4bfb2b583c83229ee4a
GIT binary patch
literal 291
zcmV+;0o?wHP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy#Ysd#RCwB?Q*8~yAP{Yv38(}lAYpY-
z36(Gjb5bct00-0oIM}%4k=)opS$E0%!`*xL$vD(a0b~czWm|$z2nhxVc-vaUIl%&}
z;9uc0i2X8h?9BNPGR}xGQrWgprl1#uq)I=;y->CRIUsA<j_1=3m6q=CTS0_4YC?c(
z442loB<MoKWq}@xAn4L@Lk4}a-aPe%y%Xn{AP_6NS0Fo(BO7Am*V$U*-m}JmO*)G_
pe>o)H>*Z6v^qIzgzw=vw0RVW~LS7gG$o>ET002ovPDHLkV1mznc8vf4

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/start2.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/start2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b3e3a08d6dd55185656c4bfb2b583c83229ee4a
GIT binary patch
literal 291
zcmV+;0o?wHP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy#Ysd#RCwB?Q*8~yAP{Yv38(}lAYpY-
z36(Gjb5bct00-0oIM}%4k=)opS$E0%!`*xL$vD(a0b~czWm|$z2nhxVc-vaUIl%&}
z;9uc0i2X8h?9BNPGR}xGQrWgprl1#uq)I=;y->CRIUsA<j_1=3m6q=CTS0_4YC?c(
z442loB<MoKWq}@xAn4L@Lk4}a-aPe%y%Xn{AP_6NS0Fo(BO7Am*V$U*-m}JmO*)G_
pe>o)H>*Z6v^qIzgzw=vw0RVW~LS7gG$o>ET002ovPDHLkV1mznc8vf4

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/stop.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe78129e2fd45e2ffa2366a63f150f36964740ad
GIT binary patch
literal 339
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
za0`PlBg3pY5<tPPo-U3d7QIs^#bzA}5NNgkd?iKGv?bv7)hnu<N-JJ8dv9D?BFHQ1
zvavej@#(J*=S8<md@4@xFtRi*e#ZXpBTG($ZNbD^=4^%a5C1DOZfnTi$SZK2wZ7{E
zx6hI%j%G~D4$QZZzpAqE6K6$Ez)Ys}!t2|f2kg|mp{6N1dGWkCDdk6f47ER8E(=Nu
zl%02Ua}DbcQ_DXacBy$h(OxXKDO-@yeJ_9Y5!QE#O!vNgj8f#)N;AAx%w8wTSFe)U
z{z`JYY1%=_u*y8oNsRW7^xpPM)X#G~$+Lfz%QvPozE8{FZFkF=Vsdkn-VLSW@evEV
gR6nrl<eX;=cRvt5zcfKM5EuXqp00i_>zopr09Chv@c;k-

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/turnoff.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/VPS2012/turnoff.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce119e58a76c4a42cd6f3fbf061c6721021883a6
GIT binary patch
literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!he<?1RCwBKQcX+~Q4pRj?RML3tp_kA
zR(|?tTgp#M2`D5;j3=t52=S(#jT%TiXiPk5JQ+w64jk~HM?E5H<l>2gBtkSq6BF?&
z65D8-{_U>wJ-QntPBNMIzW2RvX5Jez41;!m{rJZ_Iy=rGMxqfT7K<5(O?>(=*G>m4
zGceTVkR3~kqU3lh`FuX&HB~AVaqf1xpN|fYZC7j6iyI%_e+6bcaQV2Zs-O5$&g=0C
z%;|KJ%jFUg=J9yQchr~QxRFT>odjl8;6379Ve&D~LYl4#OxJbGVTwy3yWLKbB>8MM
z+sa^nCMGHv&Wz+74#xn>wL9$e@X>?%{{(=yw6ut}m>=eZSA{?*9GY{=`(;jMC$&UR
zVjOEjH^gN`7;v29;bmE-z=^;uAyBPU2PB(B^?IF7ogT?Ev<@7tXqslV1UxmES_F^V
zpi-$6-xsJ>Rb*;38WfI%ADe7l(}e({X~|^I0(hvRTrSH(fL~SsQ0CXQ(oLM55Tc0I
zZ}B;J;Pb=pe`9xdS4m{zDq34xZ<^%0_wGDfee+U86Z8B1*Uf4}!BAZYq|)h4sKQEr
zO1FCxeS=N@6%14}67XW7IEOU^(wX#UA#iDWYCaeYGE)LwR-DRuGTwVX9!(^0j)*;Q
zoZ|u8+x;{%Grb_8m!E}Q+S&R3arVY+vQR7tb$(cC)ElBL9vU$pm`Dr~Pb|&n=f6dx
zk%%?QU0t0Qo;+RN8yy=Zb6DJ}n^cb~BKE)ofdJ(f^S}9W7C&uO(6l!8rM0(fxmT;N
zX=`(fYPA}sj{5rh=*+}8WzT27u+S9qwsGOGfN7W6ud!nyUF<dXckD0Nmyy{d{uN*V
XP{b&mK6$Lr00000NkvXXu0mjfYp760

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css
index bb2b9fb5..65e1c9d5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css
@@ -293,6 +293,10 @@ UL.ActionButtons LI {margin-bottom: 12px;}
 .ActionButtonRename {padding: 3px 2px 3px 20px; background: transparent url(../images/VPS/rename.gif) left center no-repeat;}
 .ActionButtonDeleteSnapshot {padding: 3px 2px 3px 20px; background: transparent url(../images/VPS/delete3.png) left center no-repeat;}
 .ActionButtonDeleteSnapshotTree {padding: 3px 2px 3px 20px; background: transparent url(../images/VPS/delete4.png) left center no-repeat;}
+.ActionButtonApplySnapshot2012 {padding: 3px 2px 3px 20px; background: transparent url(../images/VPS2012/apply.png) left center no-repeat;}
+.ActionButtonRename2012 {padding: 3px 2px 3px 20px; background: transparent url(../images/VPS2012/rename.png) left center no-repeat;}
+.ActionButtonDeleteSnapshot2012 {padding: 3px 2px 3px 20px; background: transparent url(../images/VPS2012/delete3.png) left center no-repeat;}
+.ActionButtonDeleteSnapshotTree2012 {padding: 3px 2px 3px 20px; background: transparent url(../images/VPS2012/delete4.png) left center no-repeat;}
 .CodeEditor {width: 100%; height: 360px; font-size: 13px; white-space: pre; line-height: 16px; font-family: Consolas, Monospace;}
 .pnlControl {height:20px; margin:5px 5px; text-align:left;}
 .pnlControl span {display:inline-block; width:100px;}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/VpsMenu.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/VpsMenu.ascx.resx
new file mode 100644
index 00000000..664ce94b
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/VpsMenu.ascx.resx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="locMenuTitle.Text" xml:space="preserve">
+    <value>VPS Menu</value>
+  </data>
+  <data name="Text.VPSHome" xml:space="preserve">
+    <value>Virtual Personal Servers</value>
+  </data>
+  <data name="Text.AuditLog" xml:space="preserve">
+    <value>Audit Log</value>
+  </data>
+  <data name="Text.ExternalNetwork" xml:space="preserve">
+    <value>External Network</value>
+  </data>
+  <data name="Text.ManagementNetwork" xml:space="preserve">
+    <value>Management Network</value>
+  </data>
+  <data name="Text.PrivateNetwork" xml:space="preserve">
+    <value>Private Network</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx
index b589e4ec..d9d0b47b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx
@@ -6,23 +6,8 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="vdc_external_network" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="Network48" runat="server" />
-				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Allocate IP Addresses"></asp:Localize>
-			    </div>
 			    <div class="FormBody">
 
                 <wsp:AllocatePackageIPAddresses id="allocateAddresses" runat="server"
@@ -33,7 +18,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
-
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx.designer.cs
index 37393f5f..2f4f9863 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Localize locTitle;
-        
         /// <summary>
         /// allocateAddresses control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx
index 3df88dc9..d5eb1842 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx
@@ -5,23 +5,8 @@
 <%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
 <%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="vdc_audit_log" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="AuditLog48" runat="server" />
-				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Audit Log"></asp:Localize>
-			    </div>
 			    <div class="FormBody">
 
                     <wsp:AuditLogControl id="auditLog" runat="server" LogSource="VPS2012" />
@@ -29,6 +14,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx.designer.cs
index 8b560f54..9f52aa8a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx.designer.cs
@@ -12,42 +12,6 @@ namespace WebsitePanel.Portal.VPS2012 {
     
     public partial class VdcAuditLog {
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Localize locTitle;
-        
         /// <summary>
         /// auditLog control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx
index 058854d5..d5f52104 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx
@@ -11,23 +11,8 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="AddServer48" runat="server" />
-				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Create New VPS"></asp:Localize>
-			    </div>
 			    <div class="FormBody">
     			    	
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -576,5 +561,3 @@
 		    </div>
 	    </div>
     	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx.designer.cs
index 4baed83d..d87558f2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Localize locTitle;
-        
         /// <summary>
         /// messageBox control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx
index 7d150f05..75aafe53 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx
@@ -6,23 +6,8 @@
 <%@ Register Src="../UserControls/PackageIPAddresses.ascx" TagName="PackageIPAddresses" TagPrefix="wsp" %>
 
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="vdc_external_network" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="Image1" SkinID="Network48" runat="server" />
-				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="External Network"></asp:Localize>
-			    </div>
 			    <div class="FormBody">
 
                     
@@ -56,6 +41,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx.designer.cs
index c31d05c7..8de6f831 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx.designer.cs
@@ -12,42 +12,6 @@ namespace WebsitePanel.Portal.VPS2012 {
     
     public partial class VdcExternalNetwork {
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// Image1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image Image1;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Localize locTitle;
-        
         /// <summary>
         /// packageAddresses control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx
index 7bde89d3..f02c0f95 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx
@@ -6,23 +6,9 @@
 <%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
 <%@ Register Src="../UserControls/SearchBox.ascx" TagName="SearchBox" TagPrefix="wsp" %>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="Servers48" runat="server" />
-				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Virtual Private Servers"></asp:Localize>
-			    </div>
+			    
 			    <div class="FormBody">
                     
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -49,7 +35,7 @@
 					        <asp:TemplateField HeaderText="gvServersName" SortExpression="ItemName" meta:resourcekey="gvServersName">
 						        <ItemStyle></ItemStyle>
 						        <ItemTemplate>
-						            <asp:Image runat="server" SkinID="Vps16" />
+						            <asp:Image runat="server" SkinID="Vps2012_16" />
 							        <asp:hyperlink id="lnk1" runat="server"
 								        NavigateUrl='<%# GetServerEditUrl(Eval("ItemID").ToString()) %>'>
 								        <%# Eval("ItemName") %>
@@ -81,7 +67,7 @@
 					        </asp:TemplateField>
 						    <asp:TemplateField>
 							    <ItemTemplate>
-								    <asp:ImageButton ID="cmdDelete" runat="server" Text="Delete" SkinID="VpsDelete"
+								    <asp:ImageButton ID="cmdDelete" runat="server" Text="Delete" SkinID="VpsDelete2012"
 									    CommandName="DeleteItem" CommandArgument='<%# Eval("ItemID") %>'
 									    meta:resourcekey="cmdDelete"></asp:ImageButton>
 							    </ItemTemplate>
@@ -140,5 +126,3 @@
 		    </div>
 	    </div>
     	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx.designer.cs
index 0425a5ad..5c597bd6 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx.designer.cs
@@ -12,42 +12,6 @@ namespace WebsitePanel.Portal.VPS2012 {
     
     public partial class VdcHome {
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Localize locTitle;
-        
         /// <summary>
         /// messageBox control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx
index 65b9f276..361a0ae6 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx
@@ -11,23 +11,8 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="AddServer48" runat="server" />
-				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Import VPS"></asp:Localize>
-			    </div>
 			    <div class="FormBody">
     			    	
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -284,5 +269,3 @@
 		    </div>
 	    </div>
     	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx.designer.cs
index eb489aea..293f4aaa 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Localize locTitle;
-        
         /// <summary>
         /// messageBox control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx
index 60247599..bb14ed5b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx
@@ -4,36 +4,15 @@
 <%@ Register Src="../UserControls/PackageIPAddresses.ascx" TagName="PackageIPAddresses" TagPrefix="wsp" %>
 
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="vdc_management_network" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="Network48" runat="server" />
-				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Management Network"></asp:Localize>
-			    </div>
 			    <div class="FormBody">
-
-                    
                     <wsp:PackageIPAddresses id="packageAddresses" runat="server"
                             Pool="VpsManagementNetwork"
                             EditItemControl="vps_general"
                             SpaceHomeControl="vdc_management_network"
                             AllocateAddressesControl=""
                             ManageAllowed="true" />
-                            
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx.designer.cs
index 55cc9f69..d230826f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx.designer.cs
@@ -12,42 +12,6 @@ namespace WebsitePanel.Portal.VPS2012 {
     
     public partial class VdcManagementNetwork {
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Localize locTitle;
-        
         /// <summary>
         /// packageAddresses control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx
index 5e4cbd79..17016257 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx
@@ -7,23 +7,8 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="vdc_permissions" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="Server48" runat="server" />
-				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="User Permissions"></asp:Localize>
-			    </div>
 			    <div class="FormBody">
     			
 			        <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -116,6 +101,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx.designer.cs
index 48ccd1ab..4541a8bf 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Localize locTitle;
-        
         /// <summary>
         /// messageBox control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx
index 694c1296..f3f23d6a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx
@@ -7,26 +7,10 @@
 <%@ Register Src="../UserControls/SearchBox.ascx" TagName="SearchBox" TagPrefix="wsp" %>
 <%@ Register Src="../UserControls/Quota.ascx" TagName="Quota" TagPrefix="wsp" %>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="vdc_private_network" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="Network48" runat="server" />
-				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Private Network"></asp:Localize>
-			    </div>
 			    <div class="FormBody">
 
-
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
                     
                     <div class="FormButtonsBarClean">
@@ -93,6 +77,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx.designer.cs
index 94d7c078..aa16270e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx.designer.cs
@@ -12,42 +12,6 @@ namespace WebsitePanel.Portal.VPS2012 {
     
     public partial class VdcPrivateNetwork {
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Localize locTitle;
-        
         /// <summary>
         /// messageBox control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx
index 84bcae9d..7008be82 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx
@@ -8,23 +8,8 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="Network48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Network" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_network" />	
 			        
@@ -96,6 +81,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx.designer.cs
index 3608ce14..a8264687 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx
index 868b526e..dcb8eab2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx
@@ -8,23 +8,8 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="Image1" SkinID="Network48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Network" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_network" />
 			        	
@@ -91,6 +76,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx.designer.cs
index 3ebff9d0..fdfc7ac5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// Image1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image Image1;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx
index f5036c28..e2d1c34f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx
@@ -6,23 +6,8 @@
 <%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
 <%@ Register Src="../UserControls/AuditLogControl.ascx" TagName="AuditLogControl" TagPrefix="wsp" %>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="AuditLog48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Audit Log" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_audit_log" />	
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -32,6 +17,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx.designer.cs
index d629a48c..37b4deff 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx.designer.cs
@@ -12,42 +12,6 @@ namespace WebsitePanel.Portal.VPS2012 {
     
     public partial class VpsDetailsAuditLog {
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx
index 39f25576..6ba4ca40 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx
@@ -13,23 +13,8 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="ServerConfig48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Configuration" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_config" />	
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -209,9 +194,6 @@
 		    </div>
 	    </div>
     	
-    </div>
-</div>
-
 <asp:Panel ID="ChangePasswordPanel" runat="server" CssClass="Popup" style="display:none;">
 	<table class="Popup-Header" cellpadding="0" cellspacing="0">
 		<tr>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx.designer.cs
index 0e1944fa..ec23a2b7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx
index 024aeec9..449794e3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx
@@ -8,23 +8,8 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="DvdDrive48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="DVD" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_dvd" />
 	
@@ -57,6 +42,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx.designer.cs
index a53e046c..b907c2f6 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx
index 1d0a2e75..faa5aae9 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx
@@ -10,23 +10,8 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="ServerConfig48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Edit Configuration" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_config" />	
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -196,6 +181,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx.designer.cs
index b0942dc9..c91df83a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx
index ef3ec791..7c3cd9a0 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx
@@ -21,23 +21,8 @@ function OpenRemoteDesktopWindow(resolution, width, height) {
 }
 </script>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="Server48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="General" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_general" />	
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -207,8 +192,6 @@ function OpenRemoteDesktopWindow(resolution, width, height) {
 		    </div>
 	    </div>
     	
-    </div>
-</div>
 
 <asp:Panel ID="ChangeHostnamePanel" runat="server" CssClass="Popup" style="display:none;">
 	<table class="Popup-Header" cellpadding="0" cellspacing="0">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx.cs
index 5f768272..560a277f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx.cs
@@ -207,7 +207,7 @@ namespace WebsitePanel.Portal.VPS2012
             btn.Command = command;
             btn.Style = String.Format(
                 "background: transparent url({0}) left center no-repeat;",
-                PortalUtils.GetThemedImage(String.Format("VPS/{0}", icon)));
+                PortalUtils.GetThemedImage(String.Format("VPS2012/{0}", icon)));
 
             string localizedText = GetLocalizedString("Command." + command);
             btn.Text = localizedText != null ? localizedText : command;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx.designer.cs
index 11517fb3..ba6095a6 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx.designer.cs
@@ -39,42 +39,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal litRdpPageUrl;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx
index 096a9f3c..cf35fe1c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx
@@ -9,23 +9,8 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="Help48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Help" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_help" />	
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -71,6 +56,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx.designer.cs
index 1016a4c5..788209d2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx
index 7e329730..3d5ca172 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx
@@ -8,23 +8,8 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="DvdDrive48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="DVD" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_dvd" />
 	
@@ -66,6 +51,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx.designer.cs
index 52f9dfb6..92504b67 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx
index 83e4b413..402bcb6d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx
@@ -21,23 +21,8 @@
 </script>
 
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="Network48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Network" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_network" />	
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -196,5 +181,3 @@
 		    </div>
 	    </div>
     	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx.designer.cs
index 942ea529..d815ef82 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx
index d95158a7..f3569211 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx
@@ -5,23 +5,8 @@
 <%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
 <%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="Server48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Permissions" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_permissions" />	
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -70,6 +55,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx.designer.cs
index 095004cc..ea36c2eb 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx.designer.cs
@@ -12,42 +12,6 @@ namespace WebsitePanel.Portal.VPS2012 {
     
     public partial class VpsDetailsPermissions {
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx
index 5cd780c2..42c973c5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx
@@ -32,17 +32,6 @@
     }
 </style>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
 			    <div class="Title">
@@ -205,9 +194,6 @@
             </div>
 
         </div>
-    	
-    </div>
-</div>
 
 <asp:Panel ID="DetailsPanel" runat="server" CssClass="Popup" style="display:none;">
 	<table class="Popup-Header" cellpadding="0" cellspacing="0">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx.designer.cs
index 0d26dd04..9a8eb1df 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx.designer.cs
@@ -21,24 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
         /// <summary>
         /// imgIcon control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx
index c345ce97..8a5843f5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx
@@ -9,23 +9,8 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="Snapshot48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Snapshots" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_snapshots" />	
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -70,19 +55,19 @@
 				                </p>
 				                <ul class="ActionButtons">
 				                    <li>
-				                        <asp:LinkButton ID="btnApply" runat="server" CausesValidation="false" CssClass="ActionButtonApplySnapshot"
+				                        <asp:LinkButton ID="btnApply" runat="server" CausesValidation="false" CssClass="ActionButtonApplySnapshot2012"
 				                            meta:resourcekey="btnApply" Text="Apply" onclick="btnApply_Click"></asp:LinkButton>
 				                    </li>
 				                    <li>
-				                        <asp:LinkButton ID="btnRename" runat="server" CausesValidation="false" CssClass="ActionButtonRename"
+				                        <asp:LinkButton ID="btnRename" runat="server" CausesValidation="false" CssClass="ActionButtonRename2012"
 				                            meta:resourcekey="btnRename" Text="Rename"></asp:LinkButton>
 				                    </li>
 				                    <li>
-				                        <asp:LinkButton ID="btnDelete" runat="server" CausesValidation="false" CssClass="ActionButtonDeleteSnapshot"
+				                        <asp:LinkButton ID="btnDelete" runat="server" CausesValidation="false" CssClass="ActionButtonDeleteSnapshot2012"
 				                            meta:resourcekey="btnDelete" Text="Delete" onclick="btnDelete_Click"></asp:LinkButton>
 				                    </li>
 				                    <li>
-				                        <asp:LinkButton ID="btnDeleteSubtree" runat="server" CausesValidation="false" CssClass="ActionButtonDeleteSnapshotTree"
+				                        <asp:LinkButton ID="btnDeleteSubtree" runat="server" CausesValidation="false" CssClass="ActionButtonDeleteSnapshotTree2012"
 				                            meta:resourcekey="btnDeleteSubtree" Text="Delete subtree" 
                                             onclick="btnDeleteSubtree_Click"></asp:LinkButton>
 				                    </li>
@@ -93,11 +78,7 @@
 				    
 			    </div>
 		    </div>
-
 	    </div>
-    	
-    </div>
-</div>
 
 <asp:Panel ID="RenamePanel" runat="server" CssClass="Popup" style="display:none;">
 	<table class="Popup-Header" cellpadding="0" cellspacing="0">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx.cs
index 26a0cfae..c79f0344 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx.cs
@@ -110,14 +110,14 @@ namespace WebsitePanel.Portal.VPS2012
                     // add node
                     TreeNode node = new TreeNode(snapshot.Name, snapshot.Id);
                     node.Expanded = true;
-                    node.ImageUrl = PortalUtils.GetThemedImage("VPS/snapshot.png");
+                    node.ImageUrl = PortalUtils.GetThemedImage("VPS2012/snapshot.png");
                     parent.Add(node);
 
                     // check if the current
                     if (snapshot.IsCurrent)
                     {
                         TreeNode nowNode = new TreeNode(GetLocalizedString("Now.Text"), "");
-                        nowNode.ImageUrl = PortalUtils.GetThemedImage("VPS/start2.png");
+                        nowNode.ImageUrl = PortalUtils.GetThemedImage("VPS2012/start2.png");
                         nowNode.SelectAction = TreeNodeSelectAction.None;
                         node.ChildNodes.Add(nowNode);
                     }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx.designer.cs
index 7b57c599..090b7629 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx
index 3ec46195..bb87804f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx
@@ -5,23 +5,8 @@
 <%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
 <%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="Server48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Tools" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_tools" />	
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -51,6 +36,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx.designer.cs
index bd6726f8..9ad077d4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx.designer.cs
@@ -12,42 +12,6 @@ namespace WebsitePanel.Portal.VPS2012 {
     
     public partial class VpsDetailsTools {
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx
index 88a8006a..50859807 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx
@@ -9,23 +9,8 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="Server48" runat="server" />
-				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Move VPS"></asp:Localize>
-			    </div>
 			    <div class="FormBody">
     			    	
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -70,6 +55,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx.designer.cs
index 9ce6aa99..4813458e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Localize locTitle;
-        
         /// <summary>
         /// messageBox control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx
index b0ed67de..c9adaf05 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx
@@ -9,23 +9,8 @@
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
 
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
-    	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="DeleteServer48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Delete Server" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" />	
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx.designer.cs
index 4186b99a..6bbfc653 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx
index fa853be3..7ab3b90f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx
@@ -8,24 +8,9 @@
 <%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
-
-<div id="VpsContainer">
-    <div class="Module">
-
-	    <div class="Header">
-		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
-	    </div>
-    	
-	    <div class="Left">
-		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
-	    </div>
     	
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-				    <asp:Image ID="imgIcon" SkinID="Server48" runat="server" />
-				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Re-install Server" />
-			    </div>
 			    <div class="FormBody">
 			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_tools" />	
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -104,6 +89,3 @@
 			    </div>
 		    </div>
 	    </div>
-    	
-    </div>
-</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx.designer.cs
index 2c8b35d1..5ba2e13b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx.designer.cs
@@ -21,42 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// breadcrumb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
-        
-        /// <summary>
-        /// menu control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
-        
-        /// <summary>
-        /// imgIcon control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VpsMenu.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VpsMenu.ascx
new file mode 100644
index 00000000..dc636766
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VpsMenu.ascx
@@ -0,0 +1,11 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsMenu.ascx.cs" Inherits="WebsitePanel.Portal.VpsMenu" %>
+
+<asp:Localize ID="locMenuTitle" runat="server" meta:resourcekey="locMenuTitle" Visible="false"></asp:Localize>
+<div id="vpsMenu" runat="server">
+    <asp:Menu ID="menu" runat="server"
+        Orientation="Horizontal"
+        EnableViewState="false"
+        CssSelectorClass="TopMenu" >
+    </asp:Menu>
+</div>
+
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VpsMenu.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VpsMenu.ascx.cs
new file mode 100644
index 00000000..b406b5d5
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VpsMenu.ascx.cs
@@ -0,0 +1,137 @@
+// Copyright (c) 2015, Outercurve Foundation.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must  retain  the  above copyright notice, this
+//   list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
+//   this list of conditions  and  the  following  disclaimer in  the documentation
+//   and/or other materials provided with the distribution.
+//
+// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
+//   contributors may be used to endorse or  promote  products  derived  from  this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
+// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
+// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using System;
+using System.Web.UI.WebControls;
+
+using WebsitePanel.EnterpriseServer;
+using WebsitePanel.WebPortal;
+using WebsitePanel.Portal.UserControls;
+
+
+namespace WebsitePanel.Portal
+{
+    public partial class VpsMenu : VpsMenuControl
+    {
+        private const string PID_SPACE_VPS = "SpaceVPS2012";
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            // organization
+            bool vpsVisible = Request[DefaultPage.PAGE_ID_PARAM].Equals(PID_SPACE_VPS, StringComparison.InvariantCultureIgnoreCase);
+
+            vpsMenu.Visible = vpsVisible;
+
+            if (vpsVisible)
+            {
+                MenuItem rootItem = new MenuItem(locMenuTitle.Text);
+                rootItem.Selectable = false;
+
+                menu.Items.Add(rootItem);
+
+                BindMenu(rootItem.ChildItems);
+            }
+        }
+
+        virtual public int PackageId
+        {
+            get { return PanelSecurity.PackageId; }
+            set { }
+        }
+
+        virtual public int ItemID
+        {
+            get { return PanelRequest.ItemID; }
+            set { }
+        }
+
+
+        private PackageContext cntx = null;
+        virtual public PackageContext Cntx
+        {
+            get
+            {
+                if (cntx == null) cntx = PackagesHelper.GetCachedPackageContext(PackageId);
+                return cntx;
+            }
+        }
+
+        public void BindMenu(MenuItemCollection items)
+        {
+            if (PackageId <= 0)
+                return;
+
+            // VPS Menu
+            if (Cntx.Groups.ContainsKey(ResourceGroups.VPS2012))
+                PrepareVPS2012Menu(items);
+        }
+
+        private void PrepareVPS2012Menu(MenuItemCollection vpsItems)
+        {
+            bool isAdmin = (PanelSecurity.EffectiveUser.Role == UserRole.Administrator);
+
+            // add items
+            vpsItems.Add(CreateMenuItem("VPSHome", ""));
+
+            if (cntx.Quotas.ContainsKey(Quotas.VPS2012_EXTERNAL_NETWORK_ENABLED)
+                && !cntx.Quotas[Quotas.VPS2012_EXTERNAL_NETWORK_ENABLED].QuotaExhausted
+                || (PanelSecurity.PackageId == 1 && isAdmin))
+                vpsItems.Add(CreateMenuItem("ExternalNetwork", "vdc_external_network"));
+
+            if (isAdmin)
+                vpsItems.Add(CreateMenuItem("ManagementNetwork", "vdc_management_network"));
+
+            if (cntx.Quotas.ContainsKey(Quotas.VPS2012_PRIVATE_NETWORK_ENABLED)
+                && !cntx.Quotas[Quotas.VPS2012_PRIVATE_NETWORK_ENABLED].QuotaExhausted)
+                vpsItems.Add(CreateMenuItem("PrivateNetwork", "vdc_private_network"));
+
+            vpsItems.Add(CreateMenuItem("AuditLog", "vdc_audit_log"));
+        }
+
+        private MenuItem CreateMenuItem(string text, string key)
+        {
+            return CreateMenuItem(text, key, null);
+        }
+
+        protected virtual MenuItem CreateMenuItem(string text, string key, string img)
+        {
+            MenuItem item = new MenuItem();
+
+            item.Text = GetLocalizedString("Text." + text);
+            item.NavigateUrl = PortalUtils.EditUrl("ItemID", ItemID.ToString(), key, "SpaceID=" + PackageId);
+
+            //if (img == null)
+            //    item.ImageUrl = PortalUtils.GetThemedIcon("Icons/tool_48.png");
+            //else
+            //    item.ImageUrl = PortalUtils.GetThemedIcon(img);
+
+            return item;
+        }
+
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VpsMenu.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VpsMenu.ascx.designer.cs
new file mode 100644
index 00000000..956ae2f1
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VpsMenu.ascx.designer.cs
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal {
+    
+    
+    public partial class VpsMenu {
+        
+        /// <summary>
+        /// locMenuTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locMenuTitle;
+        
+        /// <summary>
+        /// vpsMenu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl vpsMenu;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Menu menu;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
index ebdf4a5d..50c5ef5b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
@@ -331,6 +331,16 @@
     <Compile Include="HostedSharePoint\HostedSharePointEnterpriseStorageUsage.ascx.designer.cs">
       <DependentUpon>HostedSharePointEnterpriseStorageUsage.ascx</DependentUpon>
     </Compile>
+    <Compile Include="UserControls\VpsMenuControl.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VpsMenu.ascx.cs">
+      <DependentUpon>VpsMenu.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VpsMenu.ascx.designer.cs">
+      <DependentUpon>VpsMenu.ascx</DependentUpon>
+    </Compile>
     <Compile Include="ProviderControls\HyperV2012R2_Settings.ascx.cs">
       <DependentUpon>HyperV2012R2_Settings.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -4879,6 +4889,7 @@
     <Content Include="HostedSharePoint\HostedSharePointEnterpriseRestoreSiteCollection.ascx" />
     <Content Include="HostedSharePoint\HostedSharePointEnterpriseStorageSettings.ascx" />
     <Content Include="HostedSharePoint\HostedSharePointEnterpriseStorageUsage.ascx" />
+    <Content Include="VpsMenu.ascx" />
     <Content Include="ProviderControls\HyperV2012R2_Settings.ascx" />
     <Content Include="ScheduleTaskControls\UserPasswordExpirationNotificationView.ascx" />
     <Content Include="SettingsUserPasswordExpirationLetter.ascx" />
@@ -4997,6 +5008,9 @@
     </Content>
     <Content Include="ExchangeServer\App_LocalResources\OrganizationSettingsGeneralSettings.ascx.resx" />
     <Content Include="App_LocalResources\SettingsUserPasswordResetLetter.ascx.resx" />
+    <Content Include="App_LocalResources\VpsMenu.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
     <EmbeddedResource Include="RDS\App_LocalResources\RDSEditCollectionSettings.ascx.resx" />
     <Content Include="RDSServersEditServer.ascx" />
     <Content Include="RDS\AssignedRDSServers.ascx" />