diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
index 3e322f2..058a491 100644
--- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
+++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
@@ -45,7 +45,7 @@
     <Content Include="app\controllers\AODController.js" />
     <Content Include="app\controllers\AuthenticationController.js" />
     <Content Include="app\controllers\CAController.js" />
-    <Content Include="app\controllers\CBuildController.js" />
+    <Content Include="app\controllers\CurrBuildController.js" />
     <Content Include="app\controllers\CIController.js" />
     <Content Include="app\controllers\DAController.js" />
     <Content Include="app\controllers\HomeController.js" />
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
index b556d84..7f7b754 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
@@ -1,7 +1,7 @@
-AIA.controller("3dAController", ["$scope", "$rootScope", "Modules", "$log",
-function ($scope, $rootScope, Modules, log) {
+AIA.controller("3dAController", ["$scope", "$rootScope", "pages", "$log",
+function ($scope, $rootScope, pages, log) {
 
-    $rootScope.currentActiveModuleTitle = Modules[2].Name;
+    $rootScope.currentActiveModuleTitle = pages[5].name;
     $scope.showme = true;
     $scope.IsVisible = function () {
         $scope.scroll();
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
index fd57fec..a95fc65 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
@@ -1,5 +1,5 @@
-AIA.controller("ADAMImgController", ["$scope", "$rootScope", "Modules", "$log",
-function ($scope, $rootScope, Modules, log) {
+AIA.controller("ADAMImgController", ["$scope", "$rootScope", "pages", "$log",
+function ($scope, $rootScope, pages, log) {
     $scope.showme = true;
     $scope.IsVisible = function () {
         $scope.scroll();
@@ -11,7 +11,7 @@ function ($scope, $rootScope, Modules, log) {
         $("html,body").scrollTop(0);
         //alert("scroll");
     }
-    $rootScope.currentActiveModuleTitle = Modules[8].Name;
+    $rootScope.currentActiveModuleTitle = pages[9].name;
 }]
 
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
index ab6c6fc..5e643f4 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
@@ -1,5 +1,5 @@
-AIA.controller("AODController", ["$scope", "$rootScope", "Modules", "$log",
-function ($scope, $rootScope, Modules, log) {
+AIA.controller("AODController", ["$scope", "$rootScope", "pages", "$log",
+function ($scope, $rootScope, pages, log) {
     $scope.showme = true;
     $scope.IsVisible = function () {
         $scope.scroll();
@@ -11,7 +11,7 @@ function ($scope, $rootScope, Modules, log) {
         $("html,body").scrollTop(0);
         //alert("scroll");
     }
-    $rootScope.currentActiveModuleTitle = Modules[9].Name;
+    $rootScope.currentActiveModuleTitle = pages[10].name;
 }]
 
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js
index c61ba9e..8da4735 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js
@@ -1,5 +1,5 @@
-AIA.controller("AnatTestController", ["$scope", "$rootScope", "Modules", "$log",
-function ($scope, $rootScope, Modules, log) {
+AIA.controller("AnatTestController", ["$scope", "$rootScope", "pages", "$log",
+function ($scope, $rootScope, pages, log) {
     $scope.showme = false;
     $scope.IsVisible = function () {
         $scope.scroll();
@@ -11,7 +11,7 @@ function ($scope, $rootScope, Modules, log) {
         $("html,body").scrollTop(0);
         //alert("scroll");
     }
-    $rootScope.currentActiveModuleTitle = Modules[6].Name;
+    $rootScope.currentActiveModuleTitle = pages[7].name;
 }]
 
 );
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
index ee4c285..429afed 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -1,7 +1,7 @@
-AIA.controller("CAController", ["$scope", "$rootScope", "Modules", "$log",
-function ($scope, $rootScope, Modules, log) {
+AIA.controller("CAController", ["$scope", "$rootScope", "$log","pages",
+function ($scope, $rootScope, log,pages) {
    
-    $rootScope.currentActiveModuleTitle = Modules[4].Name;
+    $rootScope.currentActiveModuleTitle = pages[4].name;
     $scope.showme = true;
     $scope.IsVisible = function () {
         $scope.scroll();
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
index 3ca1956..38ffd4d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -1,7 +1,7 @@
-AIA.controller("CIController", ["$scope", "$window", "$rootScope", "Modules", "$log",
-function ($scope, $window, $rootScope, Modules, log) {
+AIA.controller("CIController", ["$scope", "$window", "$rootScope", "Modules", "$log","pages",
+function ($scope, $window, $rootScope, Modules, log,pages) {
 
-    $rootScope.currentActiveModuleTitle = Modules[3].Name;
+    $rootScope.currentActiveModuleTitle = pages[3].name;
 
     $scope.showme = true;
     $scope.IsVisible = function () {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
index d9e0b68..27e0723 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CBuildController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
@@ -1,5 +1,7 @@
-AIA.controller("CBuildController", ["$scope", "$rootScope", "Modules", "$log",
-function ($scope, $rootScope, Modules, log) {
+AIA.controller("CurrBuildController", ["$scope", "$rootScope", "pages", "$log",
+function ($scope, $rootScope, pages, log) {
+    
+    $rootScope.currentActiveModuleTitle = pages[6].name;
     $scope.showme = false;
     $scope.IsVisible = function () {
         $scope.scroll();
@@ -11,7 +13,7 @@ function ($scope, $rootScope, Modules, log) {
         $("html,body").scrollTop(0);
         //alert("scroll");
     }
-    $rootScope.currentActiveModuleTitle = Modules[5].Name;
+   
 }]
 
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
index 6fb9d98..eca3461 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
@@ -1,8 +1,17 @@
-AIA.controller("LabExercController", ["$scope", "$rootScope", "Modules", "$log",
-function ($scope, $rootScope, Modules, log) {
-    $scope.showme = false;
-    $scope.IsVisible = function () {
+AIA.controller("LabExercController", ["$scope", "$rootScope", "pages", "$log",
+function ($scope, $rootScope, pages, log) {
+
+    $scope.$on('$viewContentLoaded', function (event) {
+        // code that will be executed ... 
+        // every time this view is loaded
+        $scope.showme = false;
+        $rootScope.currentActiveModuleTitle = pages[8].name;
         $scope.scroll();
+    });
+
+   // $scope.showme = false;
+    $scope.IsVisible = function () {
+       // $scope.scroll();
 
     }
 
@@ -11,7 +20,7 @@ function ($scope, $rootScope, Modules, log) {
         $("html,body").scrollTop(0);
         //alert("scroll");
     }
-    $rootScope.currentActiveModuleTitle = Modules[7].Name;
+   // $rootScope.currentActiveModuleTitle = pages[8].Name;
 }]
 
 );
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
index 8e9f13a..3f29507 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
@@ -1,18 +1,18 @@
 'use strict';
 
-AIA.controller("LinkController", ["$scope", "$rootScope", "Modules", "$log", "pages", "$routeParams",
-function ($scope, $rootScope, Modules, log, pages, $routeParams) {
+AIA.controller("LinkController", ["$scope", "$rootScope","$log", "pages", "$routeParams",
+function ($scope, $rootScope, log, pages, $routeParams) {
 
      //$rootScope.currentActiveModuleTitle = Modules[10].Name;
     //$rootScope.currentActiveModuleTitle = $routeParams.modname;
     $scope.links = [
-        new link("Encyclopedia", "Encyclopedia", 'http://aia5.adam.com/content.aspx?productId=117', "100%", "750px"),
+        new link("encyclopedia", "Encyclopedia", 'http://aia5.adam.com/content.aspx?productId=117', "100%", "750px"),
         new link("IP-10", "IP 10", "http://182.19.10.91:92/IPWeb10/index.aspx", "100%", "750px"),
-        new link("InDepth-Reports", "InDepth Reports", "http://aia5.adam.com/content.aspx?productId=10", "100%", "4000px"),
-        new link("Complementary-and-Alternate-Medicine", "Complementary and Alternative Medicine", "http://182.19.10.91:92/CAMHome.aspx", "100%", "750px"),
-        new link("BodyGuide", "Body Guide", "http://aia5.adam.com/content.aspx?productId=25", "100%", "1050px"),
-        new link("Symptom-Navigator", "Symptom Navigator", "http://aia5.adam.com/content.aspx?productId=44", "100%", "1000px"),
-        new link("Wellness-Tools", "The Wellness Tools", "http://aia5.adam.com/content.aspx?productId=20", "100%", "1500px")
+        new link("indepth-reports", "InDepth Reports", "http://aia5.adam.com/content.aspx?productId=10", "100%", "4000px"),
+        new link("complementary-and-alternate-medicine", "Complementary and Alternative Medicine", "http://182.19.10.91:92/CAMHome.aspx", "100%", "750px"),
+        new link("bodyguide", "Body Guide", "http://aia5.adam.com/content.aspx?productId=25", "100%", "1050px"),
+        new link("symptom-navigator", "Symptom Navigator", "http://aia5.adam.com/content.aspx?productId=44", "100%", "1000px"),
+        new link("wellness-tools", "The Wellness Tools", "http://aia5.adam.com/content.aspx?productId=20", "100%", "1500px")
     ];
 
     $scope.$on('$viewContentLoaded', function (event) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
index 66b44c4..70196f5 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -6,87 +6,89 @@ var AIA = angular.module('AIA', ['ngSanitize', 'ngRoute', 'ngStorage']);
 
 AIA.constant('pages', [
     {
+       // id:0,
         name: 'Login',
         pageSlug: 'login',
         pageUrl: 'login.html',
         pageController: 'AuthenticationController'
     },
-    {
+    {  // id:1,
         name: 'Dissectible Anatomy Views List',
         pageSlug: 'da-view-list',
         pageUrl: 'app/views/da/da-body-view-list.html',
         pageController: 'DAController'
     },
-    {
+    {   //id:2,
         name: 'Dissectible Anatomy Body View',
         pageSlug: 'da-body-view',
         pageUrl: 'app/views/da/da-body-view.html',
         pageController: 'DAController'
     },
-    {
+    {  // id:3,
         name: 'Clinical Illustrations',
-        pageSlug: 'CI-view',
+        pageSlug: 'clinical-illustrations',
         pageUrl: 'app/views/ci/ci-view.html',
         pageController: 'CIController'
 
     },
         {
-        name: 'Clinical Animationa',
-        pageSlug: 'CA-view',
+       // id:4,
+        name: 'Clinical Animations',
+        pageSlug: 'clinical-animations',
         pageUrl: 'app/views/ca/ca-view.html',
         pageController: 'CAController'
 
         },
-    {
+    {  // id:5,
         name: '3D Anatomy',
-        pageSlug: '3dAnatomy-view',
+        pageSlug: '3dAnatomy',
         pageUrl: 'app/views/3dA/3dA-view.html',
         pageController: '3dAController'
 
     },
-    {
+    {   //id:6,
         name: 'Curriculum Builder',
-        pageSlug: 'Curriculum-Builder',
+        pageSlug: 'curriculum-builder',
         pageUrl: 'app/views/CBuild/CBuild-view.html',
-        pageController: 'CBuildController'
+        pageController: 'CurrBuildController'
 
     },
-    {
+    {   //id:7,
         name: 'Anatomy Tests',
-        pageSlug: 'Anatomy-Test',
+        pageSlug: 'anatomy-test',
         pageUrl: 'app/views/AnatTest/AnatTest-view.html',
         pageController: 'AnatTestController'
 
     },
-    {
+    {   //id:8,
         name: 'Lab Exercises',
-        pageSlug: 'Lab-Exercises',
+        pageSlug: 'lab-exercises',
         pageUrl: 'app/views/LabExerc/LabExerc-view.html',
         pageController: 'LabExercController'
 
     },
-    {
+    {   //id:9,
         name: 'ADAM Images',
-        pageSlug: 'ADAM-Images',
+        pageSlug: 'ADAM-images',
         pageUrl: 'app/views/ADAMImg/ADAMImg-view.html',
         pageController: 'ADAMImgController'
 
     },
-    {
+    {   //id:10,
         name: 'ADAM On Demand',
-        pageSlug: 'ADAM-On-Demand',
+        pageSlug: 'ADAM-on-demand',
         pageUrl: 'app/views/AOD/AOD-view.html',
         pageController: 'AODController'
 
     },
-    {
+    {   //id:11,
         name: 'Encyclopedia',
-        pageSlug: 'Link/Encyclopedia',
+        pageSlug: 'Link/encyclopedia',
         pageUrl: 'app/views/Link/Link-view.html',
         pageController: 'LinkController'
 
     },
-    {
+    {   //id:12,
         name: 'IP 10',
         pageSlug: 'Link/IP-10',
         pageUrl: 'app/views/Link/Link-view.html',
@@ -94,41 +96,42 @@ AIA.constant('pages', [
 
     },
     {
+        //id:13,
         name: 'In-Depth Reports',
-        pageSlug: 'Link/InDepth-Reports',
+        pageSlug: 'Link/indepth-reports',
         pageUrl: 'app/views/Link/Link-view.html',
         pageController: 'LinkController'
 
     },
-    {
+    {   //id:14,
         name: 'Complementary and Alternative Medicine',
-        pageSlug: 'Link/Complementary-and-Alternate-Medicine',
+        pageSlug: 'Link/complementary-and-alternate-medicine',
         pageUrl: 'app/views/Link/Link-view.html',
         pageController: 'LinkController'
 
     },
-    {
+    {   //id:15,
         name: 'Body Guide',
-        pageSlug: 'Link/BodyGuide',
+        pageSlug: 'Link/bodyguide',
         pageUrl: 'app/views/Link/Link-view.html',
         pageController: 'LinkController'
 
     },
-    {
+    {   //id:16,
         name: 'Symptom Navigator',
-        pageSlug: 'Link/Symptom-Navigator',
+        pageSlug: 'Link/symptom-navigator',
         pageUrl: 'app/views/Link/Link-view.html',
         pageController: 'LinkController'
 
     },
-    {
+    {   //id:17,
         name: 'The Wellness Tools',
-        pageSlug: 'Link/Wellness-Tools',
+        pageSlug: 'Link/wellness-tools',
         pageUrl: 'app/views/Link/Link-view.html',
         pageController: 'LinkController'
 
     },
-    {
+    {   //id:18,
         name: 'home',
         pageSlug: 'home',
         pageUrl: 'app/widget/MainView.html',
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
index 78a0819..fc49083 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
@@ -19,29 +19,29 @@
         <ul class="nav nav-sidebar" ng-init="hideScrollbar()">
             <li><a href="da-view-list" ng-click="IsVisible()">Dissectible Anatomy</a></li>
             <!--<li><a href="atlas-anatomy.html">Atlas Anatomy</a></li>-->
-            <li><a href="3dAnatomy-view" ng-click="IsVisible()">3D Anatomy</a></li>
-            <li><a href="CI-view" ng-click="IsVisible()">Clinical Illustrations</a></li>
-            <li><a href="CA-view" ng-click="IsVisible()">Clinical Animations</a></li>
+            <li><a href="3dAnatomy" ng-click="IsVisible()">3D Anatomy</a></li>
+            <li><a href="clinical-illustrations" ng-click="IsVisible()">Clinical Illustrations</a></li>
+            <li><a href="clinical-animations" ng-click="IsVisible()">Clinical Animations</a></li>
             <!--<li><a href="http://aia5.adam.com/content.aspx?productId=117&ref=www.interactiveanatomy.com&url=aia5.adam.com" target="_blank">Encyclopedia</a></li>-->
-            <li><a href="Link/Encyclopedia" ng-click="IsVisible()">Encyclopedia</a></li>
-            <li><a href="Curriculum-Builder" ng-click="IsVisible()">Curriculum Builder</a></li>
-            <li><a href="Anatomy-Test" ng-click="IsVisible()">Anatomy Tests</a></li>
+            <li><a href="Link/encyclopedia" ng-click="IsVisible()">Encyclopedia</a></li>
+            <li><a href="curriculum-builder" ng-click="IsVisible()">Curriculum Builder</a></li>
+            <li><a href="anatomy-test" ng-click="IsVisible()">Anatomy Tests</a></li>
             <!--<li><a href="http://182.19.10.91:92/IPWeb10/index.aspx" target="_blank">IP 10</a></li>-->
             <!--<li><a href="IP10-view" ng-click="IsVisible()">IP 10</a></li>-->
             <li><a href="Link/IP-10" ng-click="IsVisible()">IP 10</a></li>
-            <li><a href="Lab-Exercises" ng-click="IsVisible()">Lab Exercises</a></li>
+            <li><a href="lab-exercises" ng-click="IsVisible()">Lab Exercises</a></li>
             <!--<li><a href="http://182.19.10.91:92/IndepthHome.aspx" target="_blank">In-Depth Reports</a></li>-->
-            <li><a href="Link/InDepth-Reports" ng-click="IsVisible()">In-Depth Reports</a></li>
+            <li><a href="Link/indepth-reports" ng-click="IsVisible()">In-Depth Reports</a></li>
             <!--<li><a href="http://182.19.10.91:92/CAMHome.aspx" target="_blank">Complementary and Alternative Medicine</a></li>-->
-            <li><a href="Link/Complementary-and-Alternate-Medicine" ng-click="IsVisible()">Complementary and Alternative Medicine</a></li>
+            <li><a href="Link/complementary-and-alternate-medicine" ng-click="IsVisible()">Complementary and Alternative Medicine</a></li>
             <li><a href="ADAM-Images" ng-click="IsVisible()">A.D.A.M Images</a></li>
             <!--<li><a href="http://aia5.adam.com/content.aspx?productId=25&ref=www.interactiveanatomy.com&url=aia5.adam.com" target="_blank">Body Guide</a></li>-->
-            <li><a href="Link/BodyGuide" ng-click="IsVisible()">Body Guide</a></li>
+            <li><a href="Link/bodyguide" ng-click="IsVisible()">Body Guide</a></li>
             <!--<li><a href="http://aia5.adam.com/content.aspx?productId=44&pid=44&gid=000001&ref=www.interactiveanatomy.com&url=aia5.adam.com" target="_blank">Symptom Navigator</a></li>-->
-            <li><a href="Link/Symptom-Navigator" ng-click="IsVisible()">Symptom Navigator</a></li>
+            <li><a href="Link/symptom-navigator" ng-click="IsVisible()">Symptom Navigator</a></li>
             <!--<li><a href="http://aia5.adam.com/content.aspx?productId=20&ref=www.interactiveanatomy.com&url=aia5.adam.com" target="_blank">The Wellness Tools</a></li>-->
-            <li><a href="Link/Wellness-Tools" ng-click="IsVisible()">The Wellness Tools</a></li>
-            <li><a href="ADAM-On-Demand" ng-click="IsVisible()">A.D.A.M OnDemand</a></li>
+            <li><a href="Link/wellness-tools" ng-click="IsVisible()">The Wellness Tools</a></li>
+            <li><a href="ADAM-on-demand" ng-click="IsVisible()">A.D.A.M OnDemand</a></li>
         </ul>
     </div>
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 52f7b9f..544911d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -153,7 +153,7 @@
     <script src="app/controllers/CIController.js"></script>
     <script src="app/controllers/CAController.js"></script>
     <script src="app/controllers/3dAController.js"></script>
-    <script src="app/controllers/CBuildController.js"></script>
+    <script src="app/controllers/CurrBuildController.js"></script>
     <script src="app/controllers/AnatTestController.js"></script>
     <script src="app/controllers/LabExercController.js"></script>
     <script src="app/controllers/ADAMImgController.js"></script>