diff --git a/400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs b/400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs
index 4ff8923..7128c81 100644
--- a/400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs
+++ b/400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs
@@ -67,6 +67,7 @@ namespace AIAHTML5.API.Models
                     foreach (DataRow drModule in dt.Rows)
                     {
                         userModuleHash = new Hashtable();
+                        userModuleHash.Add(AIAConstants.KEY_ID, drModule["Id"]);
                         userModuleHash.Add(AIAConstants.KEY_NAME, drModule["Name"]);
                         userModuleHash.Add(AIAConstants.KEY_SLUG, drModule["Slug"]);
                         arrUserModules.Add(userModuleHash);
@@ -207,6 +208,7 @@ namespace AIAHTML5.API.Models
                         foreach (DataRow dr in dt.Rows)
                         {
                             modulesHash = new Hashtable();
+                            modulesHash.Add(AIAConstants.KEY_ID, dr["Id"]);
                             modulesHash.Add(AIAConstants.KEY_NAME, dr["Title"]);
                             modulesHash.Add(AIAConstants.KEY_SLUG, dr["Slug"]);
                             userModulelist.Add(modulesHash);
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 53f69c9..d4a9c53 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -6730,9 +6730,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
         //  $rootScope.isListManagerSelected = false;
         $rootScope.CloseListManager();
 
-   $rootScope.isHighlightBodyByBodySystem = false;
 
-        if ($rootScope.isHighLight == true) {
+        if ($rootScope.isHighlightBodyByBodySystem) {
+            $rootScope.isHighlightBodyByBodySystem = false;
+            //to make the system highlight if the body systme highlighted than Normal and again highlight
+            $scope.isbodySystemHighlight = true;
+        }
+        //  $rootScope.isHighlightBodyByBodySystem = false;
+
+          if ($rootScope.isHighLight == true) {
 
         }
         else {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 1d39758..a831488 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -272,23 +272,39 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     
     function ShowAssignedModulesPopup(userModules) {
         var allModules = Modules;
-        var elemId = 0;
-        for (var module = 0; module <= allModules.length; module++) {
-            elemId = module + 1; // Id starts from 1
-            $('#moduleDiv' + elemId).hide();
+        var arrPendingModules = [];
+        if ($('#dvPendingModules').length > 0) {
+            $('#dvPending').hide();
         }
+        for (var module = 1; module <= allModules.length; module++) {
+            $('#moduleDiv' + module).hide();
+        }
+        if (('#moduleDiv1017').length > 0) {
+            $('#moduleDiv1017').hide();
+        }
+
         for (var count = 0; count < userModules.length; count++) {
             for (var module = 0; module < allModules.length; module++) {
-                if (userModules[count].name.trim() == allModules[module].Name.trim()) {
-                    elemId = count + 1; // Id starts from 1
-                    $('#moduleDiv' + elemId).show();
+                if (userModules[count].id == allModules[module].Id) {
+                    $('#moduleDiv' + userModules[count].id).show();
                     break;
                 }
+
+                if (userModules[count].id == 7)
+                    arrPendingModules.push(userModules[count].id);
+                if (userModules[count].id == 8)
+                    arrPendingModules.push(userModules[count].id);
+                if (userModules[count].id == 10)
+                    arrPendingModules.push(userModules[count].id);
             }
         }
         if (userModules.length > 0) {
             $('#dvUserModulesInfo').modal('show');
         }
+
+        if (arrPendingModules.length > 0) {
+            $('#dvPendingModules').show();
+        }
     }
     $rootScope.UpdateLicenseTermStatus = function () {
         $('#dvTermCondition').fadeOut();
@@ -354,7 +370,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
 
                 if (userInfo.LoginId != undefined || userInfo.LoginId != "" || userInfo.LoginId != null) {
                     
-                    if (userInfo.UserType == UserTypeConstants.SUPER_ADMIN  && result.IsActive) { //(!result.IsSubscriptionExpired) && 
+                    if (userInfo.UserType == UserTypeConstants.SUPER_ADMIN && userInfo.IsActive) { //(!result.IsSubscriptionExpired) && 
                       
                         $rootScope.userData = userInfo;
                        
@@ -3808,11 +3824,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             }, 1000);
         }
         $("#optionsListManagerTab").addClass("active");
-        var viewNameAftrSplit = $("#viewName").val().split(" ");
-        if (viewNameAftrSplit[0] == "null") {
-            document.location.href = "/";
+        var viewNameAftrSplit;
+        if ($("#viewName").val() !== null) {
+            viewNameAftrSplit = $("#viewName").val().split(" ");
+        
+            if (viewNameAftrSplit[0] == "null") {
+                document.location.href = "/";
+            }
         }
-
         if ($location.url() == "/module-item-view") {
             $("#termList").attr("onclick", "if (typeof(this.selectedIndex) != 'undefined') onSearchItemSelection(this.options[this.selectedIndex].id)");
         }
@@ -4236,6 +4255,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     };
 
     $rootScope.ShowPrintPreviewWindow = function (event) {  // Print Preview
+        if ($location.url() == "/module-item-view") {
+            if ($("#hidePinBtn").hasClass("btn-primary")) {
+                $rootScope.isHidePinBtnActiveInPrintPreview = true;
+            }
+            if ($("#selectedPin").hasClass("btn-primary")) {
+                $rootScope.isShowSelectedPinActiveInPrintPrevMode = true;
+            }
+            if ($("#allPinBtn").hasClass("btn-primary")) {
+                $rootScope.isShowAllPinBtnActiveInPrintPreviewMode = true;
+            }
+        }
         $(".tools").css("z-index", "1029");
         $rootScope.CloseListManager();
         $rootScope.CloseAnnotationTool();
@@ -4273,6 +4303,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                                 $("#printcontainer").css('width', $(window).outerWidth());
                                 $("#printcontainer").css('height', $(window).outerHeight());
                             }
+                            if ($location.url() == "/module-item-view") {
+                                $("#aaDetailViewCanvas").css("display", "none");
+                            }
                         }, 520);
                     }
                     else {
@@ -4287,6 +4320,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                                 $("#printcontainer").css('width', $(window).outerWidth());
                                 $("#printcontainer").css('height', $(window).outerHeight());
                             }
+                            if ($location.url() == "/module-item-view") {
+                                $("#aaDetailViewCanvas").css("display", "none");
+                            }
                         }, 320);
                     }
 
@@ -4300,6 +4336,13 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 }
             }
         });
+
+        if ($location.url() == "/module-item-view") {
+            $timeout(function () {
+            $rootScope.hidePins();
+            }, 100);
+        }
+
     };
 
     function OpenJSPanel() {
@@ -4436,6 +4479,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $("#annotationToolBarOptions").removeClass("disableMenuoption");
         $("#optionsListManagerTab").removeClass("disableMenuoption");
         $('#fileMenuAnchor').parent().removeClass('disableFileMenu');
+        $("#aaDetailViewCanvas").css("display", "block");
         if ($('#jsPanel-1').length > 0)
             $('#jsPanel-1').remove();
         console.log('close');
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index d174efb..2f533c3 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -143,7 +143,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
 
 
     $scope.openListViewModuleItem = function (event) {
-
         $("#demoView").remove();
         var moduleItemDataToBeSavedID = event.currentTarget.id;
         $("#list-view table tbody tr").removeClass("active");
@@ -153,7 +152,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text().trim();
         $rootScope.OpenedTileData = ModuleService.GetOpenedTileData(moduleItemDataToBeSaved, $scope.moduleLandingData);
         $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3];
-        $rootScope.listArray = [];
+        //$rootScope.listArray = [];
         $rootScope.listArray.push({ "imageName": $rootScope.OpenItemImagePath, "text": moduleItemDataToBeSaved });
         $("#viewList").append("<div class='col-xs-12 text-center' style='padding-top:15px;padding-bottom:15px;' id='demoView'><div class='col-xs-12' style='padding:15px;background-color:#fff;'><div class='col-xs-2' style='border:1px solid #000;padding:5px;color:#000;font-size:12px;'><div class='thumbnail' style='margin-bottom:10px;'><img style='width:auto;height:95px!important;' src=" + $rootScope.OpenItemImagePath + "></div><div class='col-xs-12' id='demoText' style='padding:0;'>" + moduleItemDataToBeSaved + "</div></div></div><a style='position:absolute;right:30px;bottom:34px;' onclick='openCurrentView(event)' href='javascript:void(0)' class='pull-right btn btn-primary'>Open</a></div>");
     }
@@ -304,10 +303,28 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             $rootScope.searchSelectedText = '';
 
         });
+
+        $(document).on("click", "#dvPrintPreview .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
+            
+            if ($rootScope.isShowAllPinBtnActiveInPrintPreviewMode == true) {
+                $("#allPinBtn").trigger("click");
+                $rootScope.isShowAllPinBtnActiveInPrintPreviewMode = false;
+            }
+            if ($rootScope.isHidePinBtnActiveInPrintPreview == true) {
+                $("#hidePinBtn").trigger("click");
+               $rootScope.isHidePinBtnActiveInPrintPreview = false;
+            }
+            if($rootScope.isShowSelectedPinActiveInPrintPrevMode == true)
+            {
+                $("#selectedPin").trigger("click");
+             $rootScope.isShowSelectedPinActiveInPrintPrevMode = false;
+            }
+        });
+
     })
     $rootScope.aaPinDataArray = [];
     $scope.showAllPins = function () {
-
+      
         $scope.allPinDataArray = [];
         var promise = ModuleService.getPinDataForImage($rootScope.imageName)
 
@@ -1245,7 +1262,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     $scope.$on('listManagerEvent', function (event, data) {
 
         $("#viewName").empty();
-        $("#viewName").append("<option>" + $rootScope.listArray[0].text + "</option>");
+
+        var currentView = $rootScope.getLocalStorageValue("currentViewTitle");
+        var viewNmeHtml = '<option>' + currentView + '</option>'
+        $('#viewName').append(viewNmeHtml);
+        //$("#viewName").append("<option>" + $rootScope.listArray[0].text + "</option>");
         $rootScope.isLoading = false;
         $('#spinner').css('visibility', 'hidden');
 
@@ -1338,11 +1359,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         }
     }
 
-    $scope.hidePins = function () {
+    $rootScope.hidePins = function () {
 
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
-
         $scope.hideSpeechBubble();
 
         $scope.isHidePinBtnClicked = true;
@@ -1369,12 +1389,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     }
 
     $scope.showAllPinsAfterHide = function (event) {
-
-
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
-
-
         $scope.isHidePinBtnClicked = false;
 
         if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
@@ -1399,7 +1415,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
 
 
     $scope.showSelectedPins = function () {
-
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
 
@@ -1717,9 +1732,9 @@ function showSelectedSystemPins(event) {
 
 function hidePins(event) {
 
-    var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
-    scope.$apply(function () {
-        scope.hidePins(event);
+    var rootScope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
+    rootScope.$apply(function () {
+        rootScope.hidePins(event);
     });
 }
 
@@ -1802,7 +1817,6 @@ function openListViewModuleItem(event) {
 }
 
 function openCurrentView(event) {
-
     var scope = angular.element(document.getElementById("list-view")).scope();
     scope.isListViewButtonClicked = true;
     scope.isOpenBtnClicked = true;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
index 57431dd..a82768c 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -272,7 +272,7 @@ AIA.constant('Modules', [
          Name: 'The Wellness Tools',
      },
      {
-         Id: 17,
+         Id: 1017, // Updated from 17 to 1017 to match with database Id
          Name: 'A.D.A.M. OnDemand',
      },
     
@@ -308,59 +308,59 @@ AIA.constant("LoginConstants", {
     "MAIL_SENT": "Mail sent.",
     "SQL_CONNECTION_ERROR": "We are unable to connect with database. Please contact customer support",
     "EXCEPTION_OCCURED": "We are facing some issue. Please try to login after sometime.",
-    "E_NO_ERROR": "0",
-    "E_USER_NOT_EXIST": "1",
-    "E_PASSWORD_NOT_MATCH": "2",
-    "E_USER_ID_BLOCKED_24_HRS": "3",
-    "E_USER_NOT_ACTIVE": "4",
-    "E_USER_ID_WILL_BLOCKED": "5",
-    "E_EMAIL_ID_NOT_EXIT": "6",
-    "E_LICENCE_IS_INACTIVE": "7",
-    "E_USER_NOT_MAP_TO_LICENCE_EDITION": "8",
-    "E_NO_ROW_FOUND_LICENCE_TO_EDITION_TABLE": "9",
-    "E_NO_ROW_FOUND_LICENCE_TABLE": "10",
-    "E_SECURITY_QUEST_NOT_MATCH": "11",
-    "E_SEQURITY_ANSWER_NOT_MATCH": "12",
-    "E_FORGOT_USER_ID_EMAIL_ID_NOT_EXIT": "13",
-    "E_TOTAL_NUMBER_LOGIN_EXCEED": "14",
-    "E_FORGOT_PASSWORD_EMAIL_ID_NOT_EXIST": "15",
-    "E_TEST_SETUP_ACCOUNT_USER_NAME_EXIST": "16",
-    "E_TEST_SETUP_ACCOUNT_EMAILID_EXIST": "17",
-    "E_SP_ERROR": "18",
-    "E_ACCOUNT_NUMBER_NOT_EXIST": "19",
-    "E_ACCOUNT_NUMBER_ALREADY_EXIST": "20",
-    "E_TEST_ACCOUNT_CREATED_MAIL_COULD_NOT_SENT": "21",
-    "E_MAIL_COULD_NOT_SENT": "22",
-    "E_RESELLER_ACCOUNT_CREATED_MAIL_COULD_NOT_SENT": "23",
-    "E_LICENSE_TERM_CONDITION": "24",
-    "E_EDITION_NOT_LINKED_WITH_SITE": "25",
-    "E_LOGIN_SESSION_EXPIRE": "26",
-    "E_DISCOUNT_CODE_NOT_EXIST": "27",
-    "E_DISCOUNT_CODE_ALREADY_EXIST": "28",
-
-    "E_SITE_IP_NOT_NULL": "29",
-    "E_EDITION_ID_NOT_NULL": "30",
-    "E_MASTER_SITEIP_NOT_EXIST": "31",
-    "EDITION_ID_NOT_EXIST": "32",
-    "E_ERROR_LOG": "33",
-    "E_MASTER_SITE_ALREADY_EXIST": "34",
-    "E_ACCOUNT_NUMBER_NOT_NULL": "35",
-    "E_SITE_IP_ALREADY_EXIST": "36",
-
-
-    "E_LICENCE_IS_EXPIRED": "37",
-    "E_SINGLEACCOUNT_IS_BEING_USED": "38",
-
-
-    "E_DATA_BASE_CONNECTION": "4060",
-
-
-    //login failure error constant
-    "ACCOUNT_NUMBER_NOT_NULL": "4",
-    "EDITION_ID_NOT_NULL": "5",
-    "ACCOUNT_NUMBER_NOT_EXIST": "1",
-    "EDITION_NOT_EXIST": "3",
-    "MASTER_SITEIP_NOT_EXIST": "2",
+    "E_NO_ERROR": "0",
+    "E_USER_NOT_EXIST": "1",
+    "E_PASSWORD_NOT_MATCH": "2",
+    "E_USER_ID_BLOCKED_24_HRS": "3",
+    "E_USER_NOT_ACTIVE": "4",
+    "E_USER_ID_WILL_BLOCKED": "5",
+    "E_EMAIL_ID_NOT_EXIT": "6",
+    "E_LICENCE_IS_INACTIVE": "7",
+    "E_USER_NOT_MAP_TO_LICENCE_EDITION": "8",
+    "E_NO_ROW_FOUND_LICENCE_TO_EDITION_TABLE": "9",
+    "E_NO_ROW_FOUND_LICENCE_TABLE": "10",
+    "E_SECURITY_QUEST_NOT_MATCH": "11",
+    "E_SEQURITY_ANSWER_NOT_MATCH": "12",
+    "E_FORGOT_USER_ID_EMAIL_ID_NOT_EXIT": "13",
+    "E_TOTAL_NUMBER_LOGIN_EXCEED": "14",
+    "E_FORGOT_PASSWORD_EMAIL_ID_NOT_EXIST": "15",
+    "E_TEST_SETUP_ACCOUNT_USER_NAME_EXIST": "16",
+    "E_TEST_SETUP_ACCOUNT_EMAILID_EXIST": "17",
+    "E_SP_ERROR": "18",
+    "E_ACCOUNT_NUMBER_NOT_EXIST": "19",
+    "E_ACCOUNT_NUMBER_ALREADY_EXIST": "20",
+    "E_TEST_ACCOUNT_CREATED_MAIL_COULD_NOT_SENT": "21",
+    "E_MAIL_COULD_NOT_SENT": "22",
+    "E_RESELLER_ACCOUNT_CREATED_MAIL_COULD_NOT_SENT": "23",
+    "E_LICENSE_TERM_CONDITION": "24",
+    "E_EDITION_NOT_LINKED_WITH_SITE": "25",
+    "E_LOGIN_SESSION_EXPIRE": "26",
+    "E_DISCOUNT_CODE_NOT_EXIST": "27",
+    "E_DISCOUNT_CODE_ALREADY_EXIST": "28",
+
+    "E_SITE_IP_NOT_NULL": "29",
+    "E_EDITION_ID_NOT_NULL": "30",
+    "E_MASTER_SITEIP_NOT_EXIST": "31",
+    "EDITION_ID_NOT_EXIST": "32",
+    "E_ERROR_LOG": "33",
+    "E_MASTER_SITE_ALREADY_EXIST": "34",
+    "E_ACCOUNT_NUMBER_NOT_NULL": "35",
+    "E_SITE_IP_ALREADY_EXIST": "36",
+
+
+    "E_LICENCE_IS_EXPIRED": "37",
+    "E_SINGLEACCOUNT_IS_BEING_USED": "38",
+
+
+    "E_DATA_BASE_CONNECTION": "4060",
+
+
+    //login failure error constant
+    "ACCOUNT_NUMBER_NOT_NULL": "4",
+    "EDITION_ID_NOT_NULL": "5",
+    "ACCOUNT_NUMBER_NOT_EXIST": "1",
+    "EDITION_NOT_EXIST": "3",
+    "MASTER_SITEIP_NOT_EXIST": "2",
     "LICENSE_INACTIVE": "6"
 });
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html
index 6b8159c..3999df1 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html
@@ -1,4 +1,4 @@
-<div class="bodyWrap row ">
+<div class="bodyWrap row ">
     <div ng-include="'app/widget/MainMenu.html'" />
     <div class="main" ng-init="loadForModuleById(1)">
         <!--<div class="main">-->
@@ -86,7 +86,7 @@
                 <!--<div role="tabpanel" class="tab-pane active" id="grid-view">-->
                 <div role="tabpanel" class="tab-pane active" id="grid-view">
                     <div ng-repeat="(key,val) in moduleLandingData.data.root.Item | orderBy:'_Title' ">
-                        <div id="{{val._Id}}" class="col-sm-3 col-lg-2" title="{{val._Title}}" data-ng-click="openModuleItemView($event)">
+                        <div id="{{val._Id}}" class="col-sm-3 col-lg-2" title="{{val._Title}}" ng-click="openModuleItemView($event)">
                             <div class="thumbnail">
                                 <a href="#">
                                     <img class="tinyImg" id="{{val._Title}}" ng-src="../content/images/aa/thumbnails/{{val._TileImageName}}" data-ng-click="openModuleItemView($event)" alt="" title="">
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
index 0251686..69c183b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
@@ -26,7 +26,7 @@
     <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide ">
         <!--{{name}}-->
         <ul class="nav nav-sidebar" ng-init="hideScrollbar()">
-            <li ng-repeat="module in userModules"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')"><!--{{module.name}}--></a></li>
+            <li ng-repeat="module in userModules" ng-disabled="module.id==7|| module.id==8 || module.id==10"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')" ng-disabled="module.id==7|| module.id==8 || module.id==10"><!--{{module.name}}--></a></li>
         </ul>
     </div>
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index d80869a..c23caff 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -523,9 +523,9 @@
                                                 </div>
                                                 <div class="col-sm-6" style="padding-left:13px;padding-right:13px;">
                                                     <div class=" form-group">
-                                                    <label for="SystemFont" class="font13">Available Lexicons</label>
+                                                        <label for="SystemFont" class="font13">Available Lexicons</label>
                                                         <select class="form-control" size="8" id="lexiconLangDropdown"></select>
-                                                </div>
+                                                    </div>
                                                     <p class="font11"><strong>Note :</strong> Some languages require special system fonts to display correctly</p>
                                                 </div>
                                                 <div class="clearfix"></div>
@@ -1244,56 +1244,63 @@
                     <div class="panel-body">
                         <!-- form -->
                         <form class="form-horizontal">
-                            <div class="form-group" id="moduleDiv1">
-                                <div class="col-sm-8">• Dissectible Anatomy</div>
-                            </div>
-                            <div class="form-group" id="moduleDiv2">
-                                <div class="col-sm-8">• Atlas Anatomy</div>
-                            </div>
-                            <div class="form-group" id="moduleDiv3">
-                                <div class="col-sm-8">• 3D Anatomy</div>
-                            </div>
-                            <div class="form-group" id="moduleDiv4">
-                                <div class="col-sm-8">• Clinical Illustration</div>
-                            </div>
-                            <div class="form-group" id="moduleDiv5">
-                                <div class="col-sm-8">• Clinical Animation</div>
-                            </div>
-                            <div class="form-group" id="moduleDiv6">
-                                <div class="col-sm-8">• Encyclopedia</div>
-                            </div>
-                            <div class="form-group" id="moduleDiv7">
-                                <div class="col-sm-12"><i>• Curriculum Builder (To be available by 09/25/2017)</i></div>
-                            </div>
-                            <div class="form-group" id="moduleDiv8">
-                                <div class="col-sm-8"><i>• Anatomy Test (To be available by 08/28/2017)</i></div>
-                            </div>
-                            <div class="form-group" id="moduleDiv9">
-                                <div class="col-sm-8">• IP 10</div>
-                            </div>
-                            <div class="form-group" id="moduleDiv10">
-                                <div class="col-sm-8"><i>• Lab Exercise (To be available by 08/16/2017)</i></div>
-                            </div>
-                            <div class="form-group" id="moduleDiv11">
-                                <div class="col-sm-8">• In - Depth Reports</div>
-                            </div>
-                            <div class="form-group" id="moduleDiv12">
-                                <div class="col-sm-8">• Complementary and Alternative Medicine</div>
-                            </div>
-                            <div class="form-group" id="moduleDiv13">
-                                <div class="col-sm-8">• A.D.A.M Images</div>
-                            </div>
-                            <div class="form-group" id="moduleDiv14">
-                                <div class="col-sm-8">• Body Guide</div>
-                            </div>
-                            <div class="form-group" id="moduleDiv15">
-                                <div class="col-sm-8">• Symptom Navigator</div> <!--Health-->
-                            </div>
-                            <div class="form-group" id="moduleDiv16">
-                                <div class="col-sm-8">• The Wellness Tool</div>
+                            <div>
+                                <div class="form-group" id="moduleDiv1">
+                                    <div class="col-sm-8">• Dissectible Anatomy</div>
+                                </div>
+                                <div class="form-group" id="moduleDiv2">
+                                    <div class="col-sm-8">• Atlas Anatomy</div>
+                                </div>
+                                <div class="form-group" id="moduleDiv3">
+                                    <div class="col-sm-8">• 3D Anatomy</div>
+                                </div>
+                                <div class="form-group" id="moduleDiv4">
+                                    <div class="col-sm-8">• Clinical Illustrations</div>
+                                </div>
+                                <div class="form-group" id="moduleDiv5">
+                                    <div class="col-sm-8">• Clinical Animations</div>
+                                </div>
+                                <div class="form-group" id="moduleDiv6">
+                                    <div class="col-sm-8">• Encyclopedia</div>
+                                </div>
+                                <div class="form-group" id="moduleDiv9">
+                                    <div class="col-sm-8">• IP 10</div>
+                                </div>
+                                <div class="form-group" id="moduleDiv11">
+                                    <div class="col-sm-8">• In - Depth Reports</div>
+                                </div>
+                                <div class="form-group" id="moduleDiv12">
+                                    <div class="col-sm-8">• Complementary and Alternative Medicine</div>
+                                </div>
+                                <div class="form-group" id="moduleDiv13">
+                                    <div class="col-sm-8">• A.D.A.M Images</div>
+                                </div>
+                                <div class="form-group" id="moduleDiv14">
+                                    <div class="col-sm-8">• Body Guide</div>
+                                </div>
+                                <div class="form-group" id="moduleDiv15">
+                                    <div class="col-sm-8">• Symptom Navigator</div> <!--Health-->
+                                </div>
+                                <div class="form-group" id="moduleDiv16">
+                                    <div class="col-sm-8">• The Wellness Tools</div>
+                                </div>
+                                <div class="form-group" id="moduleDiv1017">
+                                    <div class="col-sm-8">• A.D.A.M on Demand</div>
+                                </div>
                             </div>
-                            <div class="form-group" id="moduleDiv17">
-                                <div class="col-sm-8">• A.D.A.M on Demand</div>
+                            <!--<hr style="border: 1px solid;"/>-->
+                            <div id="dvPending" style="margin: 15px 0;"><b>Pending Modules</b></div>
+                            <!--<hr style="border: 1px solid;" />-->
+                            <div>
+                                <div class="form-group" id="moduleDiv7">
+                                    <div class="col-sm-12"><i>• Curriculum Builder</i></div> <!--(To be available by 09/25/2017)-->
+                                </div>
+                                <div class="form-group" id="moduleDiv8">
+                                    <div class="col-sm-8"><i>• Anatomy Test</i></div> <!--(To be available by 08/28/2017)-->
+                                </div>
+                                <div class="form-group" id="moduleDiv10">
+                                    <div class="col-sm-8"><i>• Lab Exercises</i></div> <!--(To be available by 08/16/2017)-->
+                                </div>
                             </div>
                             <div class="form-group">
                                 <div style="text-align: center">
diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
index 34a1702..5d2248b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
+++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -1093,4 +1093,11 @@ color:#ffffff !important;
  	
   width : 400px !important;
  	
- }
\ No newline at end of file
+ }
+
+li[disabled], a[disabled] {
+    pointer-events: none;
+}
+a[disabled] {
+    color: #aaa !important; 
+}
\ No newline at end of file