diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 6a439d6..b47358a 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -611,11 +611,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                         }
 
 
-                        if ($('#daImagePanel').offset().top == 0)
-                            $('#daImagePanel').css("top", '70px');
+                       // if ($('#daImagePanel').offset().top == 0)
+                           // $('#daImagePanel').css("top", '70px');
 
-                        if ($('#daImagePanel').offset().left == 0)
-                            $('#daImagePanel').css("left", '1px');
+                        //if ($('#daImagePanel').offset().left == 0)
+                          //  $('#daImagePanel').css("left", '1px');
 
                     }, 350);
                 }
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 0c238af..fcb29dd 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -261,8 +261,11 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
                                  modesty: "Y"
                              }
                              $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
+
+                            
                          }
                          //code for modesty setting
+                         $rootScope.aiaModesty = $rootScope.formsetting.modesty;
 
                          if (typeof result.LoginId != undefined || result.LoginId != "" || result.LoginId != null) {
 
@@ -639,8 +642,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
                                  $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
                              }
                              //code for modesty setting
+                             $rootScope.aiaModesty = $rootScope.formsetting.modesty;
            
-                             $rootscope.siteId = result.siteId;
+                             $rootScope.siteId = result.siteId;
 
                                 // birendra// initialize  exp img detail object
                                 $rootScope.initializeUserForExportImage(result.Id);
@@ -678,7 +682,13 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
 
                                  }
                                  else {
-                                     if (result.LicenseInfo != null ) {
+                                     if (result.LicenseInfo != null) {
+
+                                         // set license id
+                                         $scope.UpdateUserExportImageData(result.Id, 'LicenseId', result.LicenseId)
+
+                                         // set license type :note 5 for demo/test license
+                                         $scope.UpdateUserExportImageData(result.Id, 'LicenseTypeId', result.LicenseInfo.LicenseTypeId);
                                          
                                         if(result.UserExportImageDetail!=null)
                                         {
@@ -5107,6 +5117,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
         if (currentmodsetting == 'Y') {
             $rootScope.isModestyOn = true;
             $rootScope.isModestyOff = false;
+           
         }
         else {
             $rootScope.isModestyOn = false;
@@ -5158,9 +5169,13 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
 
     }
 
-    $rootScope.ChangeModesty = function (formsetting, modestyValue) {
-        formsetting.modesty = modestyValue;
-        $rootScope.setModestySettings(formsetting.modesty);
+    $rootScope.ChangeModesty = function (modestyValue) {
+        //formsetting.modesty = modestyValue;
+        $rootScope.setModestySettings(modestyValue);
+
+        //code for modesty setting
+        $rootScope.formsetting.modesty = modestyValue;
+        $rootScope.aiaModesty = $rootScope.formsetting.modesty;
 
     }
     $rootScope.isApplyBtnClicked = false;
@@ -5296,7 +5311,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
             $rootScope.ChangeEthnicity(setting, setting.ethnicity);
         }
         if (typeof (setting.modesty) !== "undefined" && setting.modesty !== null) {
-            $rootScope.ChangeModesty(setting, setting.modesty);
+            $rootScope.ChangeModesty(setting.modesty);
         }
 
         //2.
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
index ab61140..af20a6e 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
@@ -31,8 +31,8 @@
     </div>
 
 </div>
-<script src="../controllers/HomeController.js"></script>
-<script src="app/services/AuthenticationService.js"></script>
+<!--<script src="../controllers/HomeController.js"></script>
+<script src="app/services/AuthenticationService.js"></script>-->
 
 
 <script>
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.aspx b/400-SOURCECODE/AIAHTML5.Web/index.aspx
index b20c4bf..3cc2065 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.aspx
+++ b/400-SOURCECODE/AIAHTML5.Web/index.aspx
@@ -582,13 +582,13 @@
                                                     <img src="~/../content/images/common/adam-leaf.png" alt="" class="pull-left marginR5">
                                                     <div class="radio">
                                                         <label>
-                                                            <input type="radio" ng-checked="isModestyOn" ng-model="formsetting.modesty" value="Y" name="modestyRadios" id="modon" ng-click="ChangeModesty(formsetting,'Y')">
+                                                            <input type="radio" value="Y" ng-model="aiaModesty"  name="modestyRadios" id="modon" ng-click="ChangeModesty('Y')">
                                                             <span class="">On</span>
                                                         </label>
                                                     </div>
                                                     <div class="radio">
                                                         <label>
-                                                            <input type="radio" ng-checked="isModestyOff" ng-model="formsetting.modesty" value="N" name="modestyRadios" id="modoff" ng-click="ChangeModesty(formsetting,'N')">
+                                                            <input type="radio" value="N" ng-model="aiaModesty" name="modestyRadios" id="modoff" ng-click="ChangeModesty('N')">
                                                             <span class="">Off</span>
                                                         </label>
                                                     </div>
diff --git a/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts b/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts
index 77fdeff..c0cff09 100644
--- a/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts
@@ -73,7 +73,7 @@ export class UsersList implements OnInit, AfterViewChecked {
   ngOnInit(): void {
     this.modalTitle = 'LIST USER';
     this.alerts = '';
-    this.NoRecord = this.global.NoRecords;
+    this.NoRecord = '';
     
     this.Users = this.fb.group({
       FirstName:[''],
@@ -109,8 +109,8 @@ export class UsersList implements OnInit, AfterViewChecked {
     this.managerightFrm = this.fb.group({
       id: [''],
       UserTypeTitle: [''],
-      checkedRecords: this.fb.array([]),
-      UncheckedRecords: this.fb.array([])
+      checkedRecords: [this.fb.array([])],
+      UncheckedRecords: [this.fb.array([])]
       
     });
     
@@ -153,20 +153,21 @@ export class UsersList implements OnInit, AfterViewChecked {
       ],
       sort: true
     });
-    document.getElementById("fixed_table_rc").remove();
-    var testScript = document.createElement("script");
-    testScript.setAttribute("id", "fixed_table_rc");
-    testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
-    testScript.setAttribute("type", "text/javascript");
-    document.body.appendChild(testScript);
-    
+   
+    if(document.getElementById("fixed_table_rc") != null){
+      document.getElementById("fixed_table_rc").remove();
+      var testScript = document.createElement("script");
+      testScript.setAttribute("id", "fixed_table_rc");
+      testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
+      testScript.setAttribute("type", "text/javascript");
+      document.body.appendChild(testScript);
+    }
       
     this._loadingService.HideLoading("global-loading");
     
     //this.GetUserList();
   }
   handleChange(evt) {
-    debugger;
     var target = evt.target;
     if (target.value == 'true') {
       this.isActive = true;
@@ -180,7 +181,6 @@ export class UsersList implements OnInit, AfterViewChecked {
     return this.buttonStatus;
   }
   public SetClickedRow(i: number, item: any) {
-    debugger;
     this.EditbuttonStatus = true;
     this.selectedRow = i;
     this.selectedId = item['Id'];
@@ -238,7 +238,6 @@ export class UsersList implements OnInit, AfterViewChecked {
   SearchUserList(evt: any)
   {
     this.NoRecord = '';
-    debugger;
     this._loadingService.ShowLoading("global-loading");
     var tempArr = evt.split(',');
     this.pageNo = parseInt(tempArr[0]);
@@ -285,7 +284,6 @@ export class UsersList implements OnInit, AfterViewChecked {
     this.selectedRow = -1;
   }
   EditUser() {
-    debugger;
     if (this.EditbuttonStatus) {
      
       this.Mode = 'Edit';
@@ -334,7 +332,6 @@ export class UsersList implements OnInit, AfterViewChecked {
    }
   EditManageUserRights() {
     if (this.buttonStatus) {
-      debugger;
       this.Mode = 'ManageRight';
       this.modalTitle = 'MANAGE USER Right';
       this.topPos = '100px';
@@ -399,7 +396,6 @@ export class UsersList implements OnInit, AfterViewChecked {
     }
   }
   public UpdateManageUserRights() {
-    debugger;
     this.alerts = '';
     this.managerightFrm.controls['checkedRecords'].setValue(new Array<number>(this.checkedRecords.length));
     this.managerightFrm.controls['UncheckedRecords'].setValue(new Array<number>(this.UncheckedRecords.length));
@@ -447,6 +443,9 @@ export class UsersList implements OnInit, AfterViewChecked {
     if (data == "Done") {
       this.alerts = '';
       this._confirmService.activate("User Manage Rights Successfully updated.", "alertMsg");
+      this.checkedRecords = new Array<number>(this.UserManageRightsList.length); 
+      this.UncheckedRecords = new Array<number>(this.UserManageRightsList.length);
+
     }
     //if (this.closeflag) {
     //  this.close.emit(null);
diff --git a/400-SOURCECODE/Admin/src/app/shared/global.ts b/400-SOURCECODE/Admin/src/app/shared/global.ts
index 43bf023..4333282 100644
--- a/400-SOURCECODE/Admin/src/app/shared/global.ts
+++ b/400-SOURCECODE/Admin/src/app/shared/global.ts
@@ -23,6 +23,7 @@ export class GlobalService {
   LicenseId: number;
   AccLicId: number = 0;
   LoginId:string="";
+  ProtocolType:string="";
   RemoveColumns: Array<string> = ["Serial_No", "LicenseId","RowNum"]
   error;
   public href: string = "";
@@ -38,19 +39,28 @@ export class GlobalService {
     
     this.NoRecords = 'No Record Found.';
    
-    this.hostURL = "http://192.168.81.63:90/API/Adminapi/";//Birendra Machine IP 
+    this.hostURL = "http://192.168.81.63:92/API/Adminapi/";//Birendra Machine IP 
     this.LiveAPIURL = "http://interactiveanatomy.com/API/Adminapi/";
     this.QAAPIURL = "http://qa.beta.interactiveanatomy.com/API/Adminapi/";    
     this.LocalURL = "http://localhost:4200";
    
-    //**** for localhost:4200 *****//
-     //  this.resourceBaseUrl = this.hostURL;
-    //**** for localhost:4200 *****//
-   
-    // get dynamic api hosted url on local,beta and prod iis server
-       this.resourceBaseUrl = window.location.origin+"/API/Adminapi/";
+       // get protocol type
+       this.ProtocolType = window.location.protocol+"//";
+
+       if(window.location.hostname=="localhost")
+       {
+          //**** for localhost:4200 *****//
+          this.resourceBaseUrl = this.hostURL;
+       }
+       else
+       {
+          // get hosted url on uat and prod  server
+         this.resourceBaseUrl = window.location.origin+"/API/Adminapi/";
+       
+       }
 
-    if (this.resourceBaseUrl == "http://192.168.81.63:90/API/Adminapi/") {   
+       // local
+    if (this.resourceBaseUrl == this.ProtocolType+"192.168.81.63:92/API/Adminapi/") {   
       localStorage.setItem('loggedInUserDetails', JSON.stringify(
         {
           "Id": 1, "FirstName": "Maribel", "LastName": "sfsfsfsfsfsfs", "EmailId": "ravi.vishwakarma@ebix.com", "LoginId": "superadmin", "Password": "ebix@2016", "SecurityQuestionId": 1, "SecurityAnswer": "boxer", "CreatorId": 1, "CreationDate": "2009-03-02T00:00:00", "DeactivationDate": null, "ModifierId": 1, "ModifiedDate": "2017-01-24T02:03:19", "UserType": "Super Admin", "UserTypeId": 1, "IsActive": true, "IsCorrectPassword": false, "IncorrectLoginAttemptCount": 0, "IsBlocked": false, "LicenseId": 0, "EditionId": 0, "LoginFailureCauseId": 0, "Modules": [{ "slug": "da-view-list", "name": "Dissectible Anatomy", "id": 1 }, { "slug": "tile-view-list", "name": "Atlas Anatomy", "id": 2 }, { "slug": "3d-anatomy-list", "name": "3D Anatomy", "id": 3 }, { "slug": "clinical-illustrations", "name": "Clinical Illustrations", "id": 4 }, { "slug": "clinical-animations", "name": "Clinical Animations", "id": 5 }, { "slug": "Link/encyclopedia", "name": "Encyclopedia", "id": 6 }, { "slug": "curriculum-builder", "name": "Curriculum Builder", "id": 7 }, { "slug": "anatomy-test", "name": "Anatomy Test", "id": 8 }, { "slug": "Link/IP-10", "name": "IP 10", "id": 9 }, { "slug": "lab-exercises", "name": "Lab Exercises", "id": 10 }, { "slug": "Link/indepth-reports", "name": "In-Depth Reports", "id": 11 }, { "slug": "Link/complementary-and-alternate-medicine", "name": "CAM", "id": 12 }, { "slug": "ADAM-images", "name": "A.D.A.M. Images", "id": 13 }, { "slug": "Link/bodyguide", "name": "Body Guide", "id": 14 }, { "slug": "Link/health-navigator", "name": "Symptom Navigator", "id": 15 }, { "slug": "Link/wellness-tools", "name": "The Wellness Tools", "id": 16 }, { "slug": "Link/aod", "name": "A.D.A.M. OnDemand", "id": 1017 }], "LicenseInfo": [{ "Id": 0, "AccountNumber": "AIAS000319" }], "LicenseSubscriptions": null, "IsSubscriptionExpired": false, "SubscriptionExpirationDate": null, "TermsAndConditionsTitle": null, "TermsAndConditionsText": null
@@ -69,11 +79,10 @@ export class GlobalService {
         this.AccountNumber = this.loggedInUser.LicenseInfo[0].AccountNumber;
       }
 
-      //this.LiveURL = this.LocalURL+"/Admin";
     }
     // Live
-    if (this.resourceBaseUrl == "http://interactiveanatomy.com/API/Adminapi/") {
-      this.LiveURL = "http://interactiveanatomy.com";
+    if (this.resourceBaseUrl == this.ProtocolType+"interactiveanatomy.com/API/Adminapi/") {
+      this.LiveURL = this.ProtocolType+"interactiveanatomy.com";
       if (this.UserTypeName == "Client Admin" || this.UserTypeName == "District Admin") {
         this.AccountNumber = this.loggedInUser.LicenseInfo.AccountNumber
         this.AccLicId = this.loggedInUser.LicenseInfo.Id;
@@ -90,8 +99,8 @@ export class GlobalService {
     }
     
     // QA
-    if (this.resourceBaseUrl == "http://qa.beta.interactiveanatomy.com/API/Adminapi/") {
-     this.LiveURL = "http://qa.beta.interactiveanatomy.com";
+    if (this.resourceBaseUrl == this.ProtocolType+"qa.beta.interactiveanatomy.com/API/Adminapi/") {
+     this.LiveURL = this.ProtocolType+"qa.beta.interactiveanatomy.com";
      if (this.UserTypeName == "Client Admin" || this.UserTypeName == "District Admin") {
        this.AccountNumber = this.loggedInUser.LicenseInfo.AccountNumber
        this.AccLicId = this.loggedInUser.LicenseInfo.Id;