diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
index b3a3632..3ea672c 100644
--- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
+++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
@@ -47,6 +47,7 @@
     <Content Include="app\views\da\da-body-view-list.html" />
     <Content Include="app\views\da\da-body-view.html" />
     <Content Include="app\views\da\da-view.html" />
+    <Content Include="app\widget\MainMenu.html" />
     <Content Include="content\css\main.css" />
     <Content Include="content\images\1.jpg" />
     <Content Include="content\images\1000x600.jpg" />
@@ -10169,8 +10170,7 @@
     <Content Include="libs\videogular\videogular.js" />
     <Content Include="libs\videogular\videogular.min.js" />
     <Content Include="login.html" />
-    <Content Include="MainMenu.html" />
-    <Content Include="MainView.html" />
+    <Content Include="app\widget\MainView.html" />
     <Content Include="themes\default\css\bootstrap\3.3.6\bootstrap-theme.css" />
     <Content Include="themes\default\css\bootstrap\3.3.6\easyTree.css" />
     <Content Include="themes\default\css\bootstrap\3.3.6\jquery-ui-slider-pips.css" />
@@ -10230,7 +10230,7 @@
     <Content Include="libs\jquery\jquery_plugin\jquery-ui-slider-pips.js" />
     <Content Include="libs\jquery\jquery_plugin\jquery.mCustomScrollbar.concat.min.js" />
     <Content Include="libs\jquery\jquery_plugin\jquery.sticky.js" />
-    <Content Include="TopMenu.html" />
+    <Content Include="app\widget\TopMenu.html" />
     <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/400-SOURCECODE/AIAHTML5.Web/Web.config b/400-SOURCECODE/AIAHTML5.Web/Web.config
index 56bc81f..4eeb25d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/Web.config
+++ b/400-SOURCECODE/AIAHTML5.Web/Web.config
@@ -4,24 +4,76 @@
   http://go.microsoft.com/fwlink/?LinkId=169433
   -->
 <configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
+
+  <appSettings>
+    <add key="owin:AutomaticAppStartup" value="false" />
+
+  </appSettings>
   <system.web>
     <compilation debug="true" targetFramework="4.5" />
     <httpRuntime targetFramework="4.5" />
   </system.web>
-    <system.webServer>
-        <staticContent>
-            <remove fileExtension=".mp3" />
-          <clientCache cacheControlMode="DisableCache" />
-          <remove fileExtension=".woff" />
-            <mimeMap fileExtension=".woff" mimeType="application/font-woff" />
-            <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" />
-            <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
-          
-        </staticContent>
-        <defaultDocument>
-            <files>
-                <add value="login.html" />
-            </files>
-        </defaultDocument>
-    </system.webServer>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="AngularJS Routes" stopProcessing="true">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+            <add input="{REQUEST_URI}" pattern="^/(api)" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+    <staticContent>
+      <remove fileExtension=".mp3" />
+      <clientCache cacheControlMode="DisableCache" />
+      <remove fileExtension=".woff" />
+      <mimeMap fileExtension=".woff" mimeType="application/font-woff" />
+      <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" />
+      <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
+    </staticContent>
+    <defaultDocument enabled="true">
+      <files>
+        <clear />
+        <add value="Default.htm" />
+        <add value="login.html" />
+        <add value="Default.asp" />
+        <add value="index.htm" />
+        <add value="index.html" />
+        <add value="iisstart.htm" />
+        <add value="default.aspx" />
+      </files>
+    </defaultDocument>
+    <handlers>
+      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
+      <remove name="OPTIONSVerbHandler" />
+      <remove name="TRACEVerbHandler" />
+      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+    </handlers>
+  </system.webServer>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
+      <parameters>
+        <parameter value="v11.0" />
+      </parameters>
+    </defaultConnectionFactory>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+    </providers>
+  </entityFramework>
 </configuration>
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index ecc25e3..a22da61 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -6,7 +6,7 @@ AIA.controller("HomeController", ["$rootScope","Modules", "$log", "$location", "
         //$scope.pageToOpen = {
         //    name: 'MainMenu'
         //};
-        $rootScope.pageToOpen = 'MainMenu.html';
+        $rootScope.pageToOpen = 'app/widget/MainMenu.html';
         $rootScope.currentBodyViewId = 1;
         $rootScope.currentActiveModuleTitle = 'Welcome to A.D.A.M. Interactive Anatomy';//Modules[0].Name;
         $rootScope.currentActiveViewTitle;
@@ -15,5 +15,11 @@ AIA.controller("HomeController", ["$rootScope","Modules", "$log", "$location", "
         $rootScope.openViews = [];
         $rootScope.currentSlug;
         $rootScope.jsPanelTitle;
+
+
+        $rootScope.ClearIframe = function () {
+            if ($('#daImagePanel')!=null)
+              $('#daImagePanel').remove();
+        }
     }]
 );
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
index 487bee6..cdbe426 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -23,12 +23,12 @@ AIA.constant('pages', [
         pageUrl: 'app/views/da/da-body-view.html',
         pageController: 'DAController'
     },
-    //{
-    //    name: 'index',
-    //    pageSlug: 'index',
-    //    pageUrl: 'MainView.html',
-    //    pageController: 'HomeController'
-    //},
+    {
+        name: 'home',
+        pageSlug: 'home',
+        pageUrl: 'app/widget/MainView.html',
+        pageController: 'HomeController'
+    },
 ]);
 
 
@@ -80,7 +80,7 @@ AIA.config(function ($routeProvider, pages, $locationProvider) {
                     controller: pages[i].pageController
                })
             .otherwise({
-                templateUrl:'MainView.html',
+                templateUrl: 'app/widget/MainView.html',
                 controller: 'HomeController'
             })
             
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html
index 0a953a8..84ef56c 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html
@@ -1,5 +1,5 @@
 <div class="bodyWrap row ">
-    <div ng-include="'MainMenu.html'" />
+    <div ng-include="'app/widget/MainMenu.html'" />
     <div class="main" ng-init="loadDissectibleAnatomyData()">
         <!--<div class="main">-->
         <div class="col-sm-12" style="padding-left:25px; width:99%">
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view.html
index ed6df54..43ab475 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view.html
@@ -1,6 +1,6 @@
 
 <div ng-app="AIA" ng-controller="DAController">
-    <div ng-include="MainMenu.html"></div>
+    <div ng-include="aap/widget/MainMenu.html"></div>
     <div ng-init="openBodyView()" id="daView"></div>
     <div class=" daView">
       
diff --git a/400-SOURCECODE/AIAHTML5.Web/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
index 880eca5..290e2be 100644
--- a/400-SOURCECODE/AIAHTML5.Web/MainMenu.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
@@ -6,7 +6,7 @@
         <div class="clearfix" style=""></div>
     </div>
     <!--Sidebar-->
-    <div class="sidebar pull-left">
+    <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide ">
         <ul class="nav nav-sidebar">
             <li><a href="da-view-list">Dissectible Anatomy</a></li>
             <!--<li><a href="atlas-anatomy.html">Atlas Anatomy</a></li>-->
diff --git a/400-SOURCECODE/AIAHTML5.Web/MainView.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainView.html
index 43d4dfd..aac0023 100644
--- a/400-SOURCECODE/AIAHTML5.Web/MainView.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainView.html
@@ -1,5 +1,5 @@
-<div class="bodyWrap row">
-    <div ng-include="'MainMenu.html'"/>
+<div class="bodyWrap row" ng-init="ClearIframe()">
+    <div ng-include="'app/widget/MainMenu.html'"/>
     <div class="main">
         <div class="col-sm-12">
             <div align="center" id="MainImage"><img src="content/images/img1.png" alt="" title="" class="img-responsive"></div>
diff --git a/400-SOURCECODE/AIAHTML5.Web/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
index 0be7fde..0be7fde 100644
--- a/400-SOURCECODE/AIAHTML5.Web/TopMenu.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 596383f..9969389 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -42,9 +42,9 @@
                     <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#topFixedNavbar1" aria-expanded="false">
                         <span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span>
                     </button>
-                    <a class="frameLogo navbar-brand" href="welcome.html"><img src="content/images/logo-main.png" class="img-responsive" alt=""></a>
+                    <a class="frameLogo navbar-brand" href="home"><img src="content/images/logo-main.png" class="img-responsive" alt=""></a>
                 </div>
-                <div ng-include="'TopMenu.html'"></div>
+                <div ng-include="'app/widget/TopMenu.html'"></div>
             </div>
         </nav>
         <div class="bodyWrap row container-fluid">