diff --git a/WebsitePanel/Sources/WebsitePanel.Server/Web.config b/WebsitePanel/Sources/WebsitePanel.Server/Web.config
index 7addb941..cef9f27e 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.Server/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <configuration>
   <!-- Custom configuration sections -->
   <configSections>
@@ -7,34 +7,34 @@
     <section name="cachingConfiguration" type="Microsoft.Practices.EnterpriseLibrary.Caching.Configuration.CacheManagerSettings,Microsoft.Practices.EnterpriseLibrary.Caching"/>
   </configSections>
   <appSettings>
-    <add key="WebsitePanel.HyperV.UseDiskPartClearReadOnlyFlag" value="false" />
-    <add key="WebsitePanel.Exchange.ClearQueryBaseDN" value="false" />
-    <add key="WebsitePanel.Exchange.enableSP2abp" value="false" />
-    <add key="SCVMMServerName" value="" />
-    <add key="SCVMMServerPort" value="" />
+    <add key="WebsitePanel.HyperV.UseDiskPartClearReadOnlyFlag" value="false"/>
+    <add key="WebsitePanel.Exchange.ClearQueryBaseDN" value="false"/>
+    <add key="WebsitePanel.Exchange.enableSP2abp" value="false"/>
+    <add key="SCVMMServerName" value=""/>
+    <add key="SCVMMServerPort" value=""/>
   </appSettings>
   <system.diagnostics>
     <switches>
-      <add name="Log" value="2" />
+      <add name="Log" value="2"/>
       <!-- 0 - Off, 1 - Error, 2 - Warning, 3 - Info, 4 - Verbose -->
     </switches>
     <trace autoflush="true">
       <listeners>
-        <add name="DefaultListener" type="WebsitePanel.Server.Utils.EventLogTraceListener, WebsitePanel.Server.Utils" initializeData="WebsitePanel" />
+        <add name="DefaultListener" type="WebsitePanel.Server.Utils.EventLogTraceListener, WebsitePanel.Server.Utils" initializeData="WebsitePanel"/>
         <!-- Writes log to the file
         <add name="DefaultListener" type="System.Diagnostics.TextWriterTraceListener" initializeData="WebsitePanel.Server.log" />
         -->
-        <remove name="Default" />
+        <remove name="Default"/>
       </listeners>
     </trace>
   </system.diagnostics>
   <!-- Caching Configuration -->
   <cachingConfiguration defaultCacheManager="Default Cache Manager">
     <backingStores>
-      <add name="inMemory" type="Microsoft.Practices.EnterpriseLibrary.Caching.BackingStoreImplementations.NullBackingStore, Microsoft.Practices.EnterpriseLibrary.Caching" />
+      <add name="inMemory" type="Microsoft.Practices.EnterpriseLibrary.Caching.BackingStoreImplementations.NullBackingStore, Microsoft.Practices.EnterpriseLibrary.Caching"/>
     </backingStores>
     <cacheManagers>
-      <add name="Default Cache Manager" expirationPollFrequencyInSeconds="43200" maximumElementsInCacheBeforeScavenging="1000" numberToRemoveWhenScavenging="10" backingStoreName="inMemory" />
+      <add name="Default Cache Manager" expirationPollFrequencyInSeconds="43200" maximumElementsInCacheBeforeScavenging="1000" numberToRemoveWhenScavenging="10" backingStoreName="inMemory"/>
     </cacheManagers>
   </cachingConfiguration>
   <!-- WebsitePanel Configuration -->
@@ -42,127 +42,72 @@
     <!-- Security settings -->
     <security>
       <!-- Perform security check -->
-      <enabled value="true" />
+      <enabled value="true"/>
       <!-- Server password -->
-      <password value="+uxnDOdf55yuH6iZYXgYAxsfIBw=" />
+      <password value="+uxnDOdf55yuH6iZYXgYAxsfIBw="/>
     </security>
   </websitepanel.server>
   <system.web>
     <!-- Disable any authentication -->
-    <authentication mode="None" />
+    <authentication mode="None"/>
     <!-- Correct HTTP runtime settings -->
-    <httpRuntime executionTimeout="3600" maxRequestLength="16384" />
+    <httpRuntime executionTimeout="3600" maxRequestLength="16384"/>
     <!-- Set globalization settings -->
-    <globalization culture="en-US" uiCulture="en" requestEncoding="UTF-8" responseEncoding="UTF-8" fileEncoding="UTF-8" />
+    <globalization culture="en-US" uiCulture="en" requestEncoding="UTF-8" responseEncoding="UTF-8" fileEncoding="UTF-8"/>
     <!-- Web Services settings -->
     <webServices>
       <protocols>
-        <remove name="HttpPost" />
-        <remove name="HttpPostLocalhost" />
-        <remove name="HttpGet" />
+        <remove name="HttpPost"/>
+        <remove name="HttpPostLocalhost"/>
+        <remove name="HttpGet"/>
       </protocols>
-      <soapServerProtocolFactory type="Microsoft.Web.Services3.WseProtocolFactory, Microsoft.Web.Services3" />
+      <soapServerProtocolFactory type="Microsoft.Web.Services3.WseProtocolFactory, Microsoft.Web.Services3"/>
     </webServices>
-    <compilation debug="true">
-      <assemblies>
-        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-      </assemblies>
-    </compilation>
-    <pages>
-      <controls>
-        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </controls>
-    </pages>
-    <httpHandlers>
-      <remove verb="*" path="*.asmx" />
-      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="GET,HEAD" path="ScriptResource.axd" validate="false" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    </httpHandlers>
-    <httpModules>
-      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    </httpModules>
+    <compilation debug="true" targetFramework="4.0"/>
+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
   </system.web>
   <!-- WSE 3.0 settings -->
   <microsoft.web.services3>
     <diagnostics>
-      <trace enabled="false" input="InputTrace.webinfo" output="OutputTrace.webinfo" />
+      <trace enabled="false" input="InputTrace.webinfo" output="OutputTrace.webinfo"/>
     </diagnostics>
     <messaging>
-      <maxMessageLength value="-1" />
-      <mtom serverMode="optional" clientMode="On" />
+      <maxMessageLength value="-1"/>
+      <mtom serverMode="optional" clientMode="On"/>
     </messaging>
     <security>
       <securityTokenManager>
-        <add type="WebsitePanel.Server.ServerUsernameTokenManager, WebsitePanel.Server" namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" localName="UsernameToken" />
+        <add type="WebsitePanel.Server.ServerUsernameTokenManager, WebsitePanel.Server" namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" localName="UsernameToken"/>
       </securityTokenManager>
-      <timeToleranceInSeconds value="86400" />
+      <timeToleranceInSeconds value="86400"/>
     </security>
-    <policy fileName="WsePolicyCache.Config" />
+    <policy fileName="WsePolicyCache.Config"/>
   </microsoft.web.services3>
   <system.serviceModel>
     <bindings>
       <wsHttpBinding>
         <binding name="WSHttpBinding_IVirtualMachineManagementService" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="10485760" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
-          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="Message">
-            <transport clientCredentialType="Windows" proxyCredentialType="None" realm="" />
-            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default" />
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
+            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default"/>
           </security>
         </binding>
         <binding name="WSHttpBinding_IMonitoringService" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="10485760" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
-          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="Message">
-            <transport clientCredentialType="Windows" proxyCredentialType="None" realm="" />
-            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default" />
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
+            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default"/>
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
   </system.serviceModel>
-  <system.codedom>
-    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
-        <providerOption name="CompilerVersion" value="v3.5" />
-        <providerOption name="WarnAsError" value="false" />
-      </compiler>
-    </compilers>
-  </system.codedom>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules>
-      <remove name="ScriptModule" />
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    </modules>
-    <handlers>
-      <remove name="WebServiceHandlerFactory-Integrated" />
-      <remove name="ScriptHandlerFactory" />
-      <remove name="ScriptHandlerFactoryAppServices" />
-      <remove name="ScriptResource" />
-      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    </handlers>
-  </system.webServer>
   <runtime>
-    <assemblyBinding appliesTo="v2.0.50727" xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="bin/Crm2011;bin/Crm2013;bin/Exchange2013;bin/Sharepoint2013;bin/Lync2013;bin/Lync2013HP;bin/Dns2012;bin/IceWarp;bin/IIs80;bin/HyperV2012R2;bin/Crm2015" />
+      <probing privatePath="bin/Crm2011;bin/Crm2013;bin/Exchange2013;bin/Sharepoint2013;bin/Lync2013;bin/Lync2013HP;bin/Dns2012;bin/IceWarp;bin/IIs80;bin/HyperV2012R2;bin/Crm2015"/>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
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 a46db572..0bdc3196 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
@@ -364,7 +364,7 @@
     <Compile Include="SettingsUserPasswordResetLetter.ascx.designer.cs">
       <DependentUpon>SettingsUserPasswordResetLetter.ascx</DependentUpon>
     </Compile>
-    <Compile>
+    <Compile Include="SearchObject.ascx">
       <DependentUpon>SearchObject.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/Web.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/Web.config
index 7620956e..323776cc 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/Web.config
@@ -26,6 +26,7 @@
     -->
 		<httpHandlers>
 			<add verb="*" path="Reserved.ReportViewerWebControl.axd" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" validate="false" />
+      <add verb="*" path="AjaxHandler.ashx" type="WebsitePanel.WebPortal.WebsitePanelAjaxHandler, WebsitePanel.WebPortal" />
 		</httpHandlers>
 		<!-- Authentication -->
 		<authentication mode="Forms">