diff --git a/400-SOURCECODE/AIAHTML5.API/Constants/ErrorHelper.cs b/400-SOURCECODE/AIAHTML5.API/Constants/ErrorHelper.cs
index ef97db0..35ef565 100644
--- a/400-SOURCECODE/AIAHTML5.API/Constants/ErrorHelper.cs
+++ b/400-SOURCECODE/AIAHTML5.API/Constants/ErrorHelper.cs
@@ -71,6 +71,8 @@ namespace AIAHTML5.API.Constants
         public const int EDITION_NOT_EXIST = 3;
         public const int MASTER_SITEIP_NOT_EXIST = 2;
         public const int LICENSE_INACTIVE = 6;
+        public const int LICENSE_EXPIRED = 7;
+        public const int LICENSE_NOTSTARTED = 8;
 
 
         /// <summary>
diff --git a/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs b/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
index eca2c65..d05b7f2 100644
--- a/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
+++ b/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
@@ -307,15 +307,26 @@ namespace AIAHTML5.API.Controllers
                 string expirationDate = null;
                 bool isLicenseExpired = false;
 
+                // validate license start date
+                string startDate = null;
+                bool isSubscriptionNotStart = false;
+
                 if (userInfo.LicenseSubscriptions != null)
                 {
+                    isSubscriptionNotStart = AIAHTML5.API.Models.Users.checkIfLicenseNotStarted(userInfo.LicenseSubscriptions, out startDate);
+
                     isLicenseExpired = AIAHTML5.API.Models.Users.checkIfLicenseExpired(userInfo.LicenseSubscriptions, out expirationDate);
                 }
 
                 if (isLicenseExpired)
                 {
                     userInfo.IsSubscriptionExpired = isLicenseExpired;
-                    userInfo.SubscriptionExpirationDate = expirationDate;
+                    userInfo.SubscriptionExpirationDate = expirationDate;             
+                }
+                else if (isSubscriptionNotStart)
+                {
+                    userInfo.IsSubscriptionNotStart = isSubscriptionNotStart;
+                    userInfo.SubscriptionStartDate = startDate;
                 }
                 else
                 {
@@ -323,7 +334,6 @@ namespace AIAHTML5.API.Controllers
 
                     userInfo.IsModestyOn = AIAHTML5.API.Models.Users.IsModestyActiveForThisLicense(userInfo.LicenseId, Convert.ToInt16(userInfo.EditionId));
 
-
                 }
             }
 
diff --git a/400-SOURCECODE/AIAHTML5.API/Models/User.cs b/400-SOURCECODE/AIAHTML5.API/Models/User.cs
index 8b934c9..a404612 100644
--- a/400-SOURCECODE/AIAHTML5.API/Models/User.cs
+++ b/400-SOURCECODE/AIAHTML5.API/Models/User.cs
@@ -47,7 +47,9 @@ namespace AIAHTML5.API.Models
         public License LicenseInfo { get; set; }
         public LicenseSubscriptionDetails LicenseSubscriptions { get; set; }
         public LicenseUserExportedImageDetail UserExportImageDetail { get; set; }
-        
+
+        public bool IsSubscriptionNotStart { get; set; }
+        public string SubscriptionStartDate { get; set; }
         public bool IsSubscriptionExpired { get; set; }
         public string SubscriptionExpirationDate { get; set; }
         public string TermsAndConditionsTitle { get; set; }
diff --git a/400-SOURCECODE/AIAHTML5.API/Models/Users.cs b/400-SOURCECODE/AIAHTML5.API/Models/Users.cs
index 2a71239..0e69933 100644
--- a/400-SOURCECODE/AIAHTML5.API/Models/Users.cs
+++ b/400-SOURCECODE/AIAHTML5.API/Models/Users.cs
@@ -159,6 +159,27 @@ namespace AIAHTML5.API.Models
                 return false;
         }
 
+        internal static bool checkIfLicenseNotStarted(LicenseSubscriptionDetails subscriptionDetail, out string startDate)
+        {
+            startDate = string.Empty;
+            bool IsSubscriptionNotStart = false;
+
+            // validate stat date for new license
+            if (subscriptionDetail != null && subscriptionDetail.RenewalDate==null)
+            {
+                DateTime? SubscriptionValidFrom = subscriptionDetail.SubscriptionValidFrom;
+                if (SubscriptionValidFrom != null && SubscriptionValidFrom.Value.Date <= DateTime.Now.Date)
+                {
+                    IsSubscriptionNotStart = false;
+                }
+                else
+                {
+                    IsSubscriptionNotStart = true;
+                    startDate = subscriptionDetail.SubscriptionValidFrom.Value.Date.ToString("MM/dd/yyyy").ToString();
+                }
+            }
+            return IsSubscriptionNotStart;
+        }
         internal static bool checkIfLicenseExpired(LicenseSubscriptionDetails subscriptionDetail, out string expirationDate)
         {
             expirationDate = string.Empty;
@@ -507,9 +528,15 @@ namespace AIAHTML5.API.Models
 
         public static User ValidateSiteLogin(String strSiteIP, String strAcccountNumber, String strUrlReferer, string strEdition, int intSiteId)
         {
-            bool isExpired = false;
             User userInfo = null;
-          
+
+            string expirationDate = null;
+            bool isLicenseExpired = false;
+
+            // validate license start date
+            string startDate = null;
+            bool isSubscriptionNotStart = false;
+
             int intLicenseId = 0;
             int intEditionId = Convert.ToInt16(strEdition);
 
@@ -541,26 +568,32 @@ namespace AIAHTML5.API.Models
                             //05.3 get licenseSubscription details
                             userInfo.LicenseSubscriptions = AIAHTML5.API.Models.Users.getLicenseSubscriptionDetails( userInfo.LicenseInfo.Id);
 
-                            //05.4 check the License expiration irespective of either user is active or not because on AIA
-                            //we shows the License expiration message for inactive users too
-
+                        //05.4 check the License expiration irespective of either user is active or not because on AIA
+                        //we shows the License expiration message for inactive users too
 
                             if (userInfo.LicenseSubscriptions != null)
                             {
-                                DateTime? subscriptionValidThrough = userInfo.LicenseSubscriptions.SubscriptionValidThrough;
-                                if (subscriptionValidThrough != null && subscriptionValidThrough.Value.Date >= DateTime.Now.Date)
-                                {
-                                    isExpired = false;
-                                }
-                                else
-                                {
-                                    isExpired = true;
-                                }
-                            }
+                                isSubscriptionNotStart = AIAHTML5.API.Models.Users.checkIfLicenseNotStarted(userInfo.LicenseSubscriptions, out startDate);
 
+                                isLicenseExpired = AIAHTML5.API.Models.Users.checkIfLicenseExpired(userInfo.LicenseSubscriptions, out expirationDate);
+                            }
 
+                            if (Convert.ToBoolean(licRow["IsActive"]) != true)
+                            {
+                              userInfo.LoginFailureCauseId = ErrorHelper.LICENSE_INACTIVE;
+                            }
+                            else if(isLicenseExpired)
+                            {
+                                userInfo.LoginFailureCauseId = ErrorHelper.LICENSE_EXPIRED;
+                                userInfo.SubscriptionExpirationDate = expirationDate;
+                            }
+                            else if (isSubscriptionNotStart)
+                            {
+                                userInfo.LoginFailureCauseId = ErrorHelper.LICENSE_NOTSTARTED;
+                                userInfo.SubscriptionStartDate = startDate;
 
-                            if (!isExpired && Convert.ToBoolean(licRow["IsActive"]) == true)
+                            }
+                            else
                             {
                                 //User objUserContext = new User();
                                 userInfo.Id = 0;
@@ -601,25 +634,19 @@ namespace AIAHTML5.API.Models
                                 // get edition features details
                                 userInfo.objEditionFeatures = objDBModel.GetEditionFeatures((Byte)intEditionId);
 
-
-
                                 if (intLicenseId > 0)
                                     userInfo.Modules = getModuleListByLicenseId(intLicenseId);
                                 else
                                     userInfo.Modules = getAllModulesList();
 
-
                                 // get exported image detail
                                 userInfo.UserExportImageDetail = getExportedImageDetail(userInfo.LicenseId);
 
-                               // insert login details
-                               objDBModel.InsertSiteLoginDetails(strAcccountNumber, strSiteIP, strEdition);
-
-                            }
-                            else
-                            {
-                                userInfo.LoginFailureCauseId = ErrorHelper.LICENSE_INACTIVE;
+                                // insert login details
+                                objDBModel.InsertSiteLoginDetails(strAcccountNumber, strSiteIP, strEdition);
                             }
+
+                       
                         }
                         else
                         {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 1b1270d..64dc6ea 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -2671,7 +2671,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
 
                     }
                     else if ((viewOrientationId == '5')) {
-                        totalCanvas = 4;
+                        totalCanvas = 1;//used canvas only one for annotation text and clicked.
 
                     }
                     else if ((viewOrientationId == '6')) {
@@ -2681,15 +2681,35 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
 
                     if ($scope.ColoredImageSRC.length < totalCanvas) {
 
+                        if (viewOrientationId == '5')
+                        {
+                            if(bodyRegionId==6)//used for arms only
+                            {
+                                $scope.ColoredImageSRC.push(
+                                    {
+                                        "bodyRegionId": bodyRegionId, "SRC": src,
+                                        "Height": h,
+                                        "Width": w,
+                                        "x": x,
+                                        "y": y,
+                                        "haveMirror": 'true'
+                                    } );
+                            }
+
+                        }
+                        else
+                        {
                             $scope.ColoredImageSRC.push(
-                                         {
-                                             "bodyRegionId": bodyRegionId, "SRC": src,
-                                             "Height": h,
-                                             "Width": w,
-                                             "x": x,
-                                             "y": y,
-                                             "haveMirror": 'true'
-                                         } );
+                                {
+                                    "bodyRegionId": bodyRegionId, "SRC": src,
+                                    "Height": h,
+                                    "Width": w,
+                                    "x": x,
+                                    "y": y,
+                                    "haveMirror": 'true'
+                                } );
+                        }
+                           
 
                     }
 
@@ -2716,7 +2736,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                         else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && ($scope.ColoredImageSRC.length == 5)) {
                             isEligibleForHighlight = true;
                         }
-                        else if ((viewOrientationId == '5') && ($scope.ColoredImageSRC.length == 4)) {
+                        else if ((viewOrientationId == '5') && ($scope.ColoredImageSRC.length == 1)) {
                             isEligibleForHighlight = true;
                         }
                         else if ((viewOrientationId == '6') && ($scope.ColoredImageSRC.length == 1)) {
@@ -3161,7 +3181,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
 
                         }
                         else if ((viewOrientationId == '5')) {
-                            totalCanvas = 4;
+                            totalCanvas = 1;
 
                         }
                         else if ((viewOrientationId == '6')) {
@@ -3170,15 +3190,34 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
 
                         if ($scope.ColoredImageSRC.length < totalCanvas) {
 
+                            if (viewOrientationId == '5')
+                            {
+                                if(bodyRegionId==6)//used for arms only
+                                {
+                                    $scope.ColoredImageSRC.push(
+                                        {
+                                            "bodyRegionId": bodyRegionId, "SRC": src,
+                                            "Height": h,
+                                            "Width": w,
+                                            "x": x,
+                                            "y": y,
+                                            "haveMirror": 'false'
+                                        } );
+                                }
+
+                            }
+                            else
+                            {
                                 $scope.ColoredImageSRC.push(
-                                             {
-                                                 "bodyRegionId": bodyRegionId, "SRC": src,
-                                                 "Height": h,
-                                                 "Width": w,
-                                                 "x": x,
-                                                 "y": y,
-                                                 "haveMirror": 'false'
-                                             } );
+                                    {
+                                        "bodyRegionId": bodyRegionId, "SRC": src,
+                                        "Height": h,
+                                        "Width": w,
+                                        "x": x,
+                                        "y": y,
+                                        "haveMirror": 'false'
+                                    } );
+                            }
 
                         }
 
@@ -3205,7 +3244,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                             else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && ($scope.ColoredImageSRC.length == 5)) {
                                 isEligibleForHighlight = true;
                             }
-                            else if ((viewOrientationId == '5') && ($scope.ColoredImageSRC.length == 4)) {
+                            else if ((viewOrientationId == '5') && ($scope.ColoredImageSRC.length == 1)) {
                                 isEligibleForHighlight = true;
                             }
                             else if ((viewOrientationId == '6') && ($scope.ColoredImageSRC.length == 1)) {
@@ -3731,8 +3770,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (ColoredImageSRC.length == 5)) {
                     loopLength = 5;
                 }
-                else if ((viewOrientationId == '5') && (ColoredImageSRC.length == 4)) {
-                    loopLength = 4;
+                else if ((viewOrientationId == '5') && (ColoredImageSRC.length == 1)) {
+                    loopLength = 1;
                 }
                 else if ((viewOrientationId == '6') && (ColoredImageSRC.length == 1)) {
                     loopLength = 1;
@@ -3912,7 +3951,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
             $scope.SetwindowStoreData(windowviewid,'currentLayerNumber',nlayer);
 
             $scope.SetwindowStoreData(windowviewid,'layerNumber',$("#txtLayerNumberDA_" + windowviewid).val());
-            $scope.DisableUI();
+            //$scope.DisableUI();
             console.log('HighlightBodyByTermList is called');
 
             $scope.highlightedBR = [];
@@ -3929,8 +3968,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (ColoredImageSRC.length == 5)) {
                     loopLength = 5;
                 }
-                else if ((viewOrientationId == '5') && (ColoredImageSRC.length == 4)) {
-                    loopLength = 4;
+                else if ((viewOrientationId == '5') && (ColoredImageSRC.length == 1)) {
+                    loopLength = 1;
                 }
                 else if ((viewOrientationId == '6') && (ColoredImageSRC.length == 1)) {
                     loopLength = 1;
@@ -3977,12 +4016,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                                 else {
                                     if (updatedGrayDataList[bodyRegionId - 1] == null || updatedGrayDataList[bodyRegionId - 1] == undefined) {
 
-                                        if (grayImageMRDataList[bodyRegionId] != null || grayImageMRDataList[bodyRegionId] != undefined)     {
+                                        if (grayImageMRDataList[bodyRegionId] != null || grayImageMRDataList[bodyRegionId] != undefined){
                                             grayImageDataVar = grayImageMRDataList[bodyRegionId];
                                         }
                                     }
                                     else {
-                                        if (updatedGrayMRDataList[bodyRegionId] != null || updatedGrayMRDataList[bodyRegionId] !=                 undefined) {
+                                        if (updatedGrayMRDataList[bodyRegionId] != null || updatedGrayMRDataList[bodyRegionId] != undefined) {
                                             grayImageDataVar = updatedGrayMRDataList[bodyRegionId]
                                         }
                                     }
@@ -4002,12 +4041,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
 
                                 //on layer change we need the fresh data not the updated one
                                 if ($scope.isLayerChange == true) {
-                                    if ($rootScope.isAnnotatiomToolBarPopupActive == true && (updatedGrayDataList[bodyRegionId - 1] !=        null || updatedGrayDataList[bodyRegionId - 1] != undefined)) {
+                                    if ($rootScope.isAnnotatiomToolBarPopupActive == true && (updatedGrayDataList[bodyRegionId - 1] !=null || updatedGrayDataList[bodyRegionId - 1] != undefined)) {
 
                                         grayImageDataVar = updatedGrayDataList[bodyRegionId - 1];
                                     }
 
-                                    else if (grayImageDataList[bodyRegionId - 1] != null || grayImageDataList[bodyRegionId - 1] !=                 undefined) {
+                                    else if (grayImageDataList[bodyRegionId - 1] != null || grayImageDataList[bodyRegionId - 1] !=undefined) {
                                              grayImageDataVar = grayImageDataList[bodyRegionId - 1];
 
                                     }
@@ -4015,15 +4054,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                                 } else {
                                     // this code is for the case where user first click on normal mode then extract then again highlight then we need to call highlight body in gray mode
                                     //and then highlight the previously selected body regions at the time of normal mode.
-                                    if (updatedGrayDataList[bodyRegionId - 1] == null || updatedGrayDataList[bodyRegionId - 1] ==             undefined)
+                                    if (updatedGrayDataList[bodyRegionId - 1] == null || updatedGrayDataList[bodyRegionId - 1] ==undefined)
                                     {
-                                        if (grayImageDataList[bodyRegionId - 1] != null || grayImageDataList[bodyRegionId - 1] !=                 undefined) {
+                                        if (grayImageDataList[bodyRegionId - 1] != null || grayImageDataList[bodyRegionId - 1] != undefined) {
                                             grayImageDataVar = grayImageDataList[bodyRegionId - 1];
                                         }
 
                                     }
                                     else {
-                                        if (updatedGrayDataList[bodyRegionId - 1] != null || updatedGrayDataList[bodyRegionId - 1] !=             undefined) {
+                                        if (updatedGrayDataList[bodyRegionId - 1] != null || updatedGrayDataList[bodyRegionId - 1] !=undefined) {
                                             // for normal case means without interdepency button case.
                                             grayImageDataVar = updatedGrayDataList[bodyRegionId - 1];
                                         }
@@ -9138,7 +9177,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                     else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (ColoredImageSRC.length == 5)) {
                         doHighlightOrExtract = true;
                     }
-                    else if (((viewOrientationId == '5')) && (ColoredImageSRC.length == 4)) {
+                    else if (((viewOrientationId == '5')) && (ColoredImageSRC.length == 1)) {
                         doHighlightOrExtract = true;
                     }
                     else if (((viewOrientationId == '6')) && (ColoredImageSRC.length == 1)) {
@@ -9274,7 +9313,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
 
                                         }
                                         else if ((viewOrientationId == '5')) {
-                                            totalCanvas = 4;
+                                            totalCanvas = 1;
 
                                         }
                                         else if ((viewOrientationId == '6')) {
@@ -9320,7 +9359,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                                             else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && ($scope.grayedBR.length == 5)) {
                                                 isEligibleForHighlightBodyByTermList = true;
                                             }
-                                            else if (((viewOrientationId == '5')) && ($scope.grayedBR.length == 4)) {
+                                            else if (((viewOrientationId == '5')) && ($scope.grayedBR.length == 1)) {
                                                 isEligibleForHighlightBodyByTermList = true;
                                             }
                                             else if (((viewOrientationId == '6')) && ($scope.grayedBR.length == 1)) {
@@ -10330,7 +10369,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                         else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (grayedBR.length == 5)) {
                             $scope.isAlreadyHighlighted = true;
                         }
-                        else if (((viewOrientationId == '5')) && (grayedBR.length == 4)) {
+                        else if (((viewOrientationId == '5')) && (grayedBR.length == 1)) {
                             $scope.isAlreadyHighlighted = true;
                         }
                         else if (((viewOrientationId == '6')) && (grayedBR.length == 1)) {
@@ -10514,7 +10553,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                         else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (ColoredImageSRC.length == 5)) {
                             $scope.EnableUI();
                         }
-                        else if ((viewOrientationId == '5') && (ColoredImageSRC.length == 4)) {
+                        else if ((viewOrientationId == '5') && (ColoredImageSRC.length == 1)) {
                             $scope.EnableUI();
                         }
                         else if ((viewOrientationId == '6') && (ColoredImageSRC.length == 1)) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 1c20ed0..2346eec 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -995,6 +995,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                                  $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
                                  $("#messageModal").modal('show');
                              }
+                             else if ((result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (result.LicenseInfo.IsActive) && (result.IsSubscriptionNotStart)) {
+                                // validation for new license which license start date is future date .
+                                $rootScope.isVisibleLogin = true;
+                                 $rootScope.LoginEnableUI();
+                                 $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_NOT_START_MESSAGE + result.SubscriptionStartDate + '.';
+                                 $("#messageModal").modal('show');
+                             }
                              else if ((result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && (!result.IsSubscriptionExpired)) {
                                  $rootScope.isVisibleLogin = true;
                                  $rootScope.LoginEnableUI();
@@ -1376,7 +1383,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
              .then(
              function (result) {
                  console.log(result);               
-                 if (result != null) {
+                 if (result != null) 
+                 {
                      console.log(result);
                      if (result == LoginConstants.INVALID_CLIENT) {
                          $rootScope.isVisibleLogin = true;
@@ -1390,7 +1398,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                          $rootScope.errorMessage = LoginConstants.MSG_NOT_AUTHORIZE_SITE_USER;
                          $("#messageModal").modal('show');
                      }
-
                      else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_ACCOUNT_NUMBER_NOT_NULL) {
                          $rootScope.isVisibleLogin = true;
                          $rootScope.LoginEnableUI();
@@ -1415,159 +1422,169 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                          $rootScope.errorMessage = LoginMessageConstants.LICENSE_INACTIVE_MESSAGE;
                          $("#messageModal").modal('show');
                      }
+                     else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.SITELICENSE_EXPIRED) {
+                        $rootScope.isVisibleLogin = true;
+                        $rootScope.LoginEnableUI();
+                        $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
+                        $("#messageModal").modal('show');
+                     }
+                     else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.SITELICENSE_NOTSTARTED) {
+                        $rootScope.isVisibleLogin = true;
+                        $rootScope.LoginEnableUI();
+                        $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_NOT_START_MESSAGE + result.SubscriptionStartDate + '.';
+                        $("#messageModal").modal('show');
+                     }
+                     else 
+                     {
+                        // update result with session detail
+                        result.aiaIdleTime=$rootScope.aiaIdleTime;
+                        result.aiaIdleTimeOut=$rootScope.aiaIdleTimeOut;
+                        result.aiaPingInterval=$rootScope.aiaPingInterval;
+                        result.SessionId=siteInfo.SessionId;                   
+                        //display user name
+                        $rootScope.userName=result.FirstName+" "+result.LastName;
+                        if (typeof result.FirstName != undefined || result.FirstName != "" || result.FirstName != null) {
+                            //code for modesty setting
+                            if (result.LicenseInfo != null) {
+                                if (result.Modesty) {
+                                    $rootScope.isModestyOn = true;
+                                    $rootScope.isModestyOff = false;
+                                    localStorage.setItem("globalModesty", "Y");
+                                    $rootScope.formsetting = {
+                                        ethnicity: null,
+                                        modesty: "Y"
+                                    }
+                                    $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
+                                }
+                                else {
+                                    $rootScope.isModestyOn = false;
+                                    $rootScope.isModestyOff = true;
+                                    localStorage.setItem("globalModesty", "N");
+                                    $rootScope.formsetting = {
+                                        ethnicity: null,
+                                        modesty: "N"
+                                    }
+                                    $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
+                                }
+                            }
+                            else {
+                                $rootScope.isModestyOn = true;
+                                $rootScope.isModestyOff = false;
+                                localStorage.setItem("globalModesty", "Y");
+                                $rootScope.formsetting = {
+                                    ethnicity: null,
+                                    modesty: "Y"
+                                }
+                                $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
+                            }
+                            //code for modesty setting
+                            $rootScope.aiaModesty = $rootScope.formsetting.modesty;
 
+                            $rootScope.siteId = result.siteId;
 
-                     else {
-                          // update result with session detail
-                            result.aiaIdleTime=$rootScope.aiaIdleTime;
-                            result.aiaIdleTimeOut=$rootScope.aiaIdleTimeOut;
-                            result.aiaPingInterval=$rootScope.aiaPingInterval;
-                            result.SessionId=siteInfo.SessionId;                   
-                            //display user name
-                            $rootScope.userName=result.FirstName+" "+result.LastName;
-                         if (typeof result.FirstName != undefined || result.FirstName != "" || result.FirstName != null) {
-                             //code for modesty setting
-                             if (result.LicenseInfo != null) {
-                                 if (result.Modesty) {
-                                     $rootScope.isModestyOn = true;
-                                     $rootScope.isModestyOff = false;
-                                     localStorage.setItem("globalModesty", "Y");
-                                     $rootScope.formsetting = {
-                                         ethnicity: null,
-                                         modesty: "Y"
-                                     }
-                                     $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
-                                 }
-                                 else {
-                                     $rootScope.isModestyOn = false;
-                                     $rootScope.isModestyOff = true;
-                                     localStorage.setItem("globalModesty", "N");
-                                     $rootScope.formsetting = {
-                                         ethnicity: null,
-                                         modesty: "N"
-                                     }
-                                     $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
-                                 }
-                             }
-                             else {
-                                 $rootScope.isModestyOn = true;
-                                 $rootScope.isModestyOff = false;
-                                 localStorage.setItem("globalModesty", "Y");
-                                 $rootScope.formsetting = {
-                                     ethnicity: null,
-                                     modesty: "Y"
-                                 }
-                                 $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
-                             }
-                             //code for modesty setting
-                             $rootScope.aiaModesty = $rootScope.formsetting.modesty;
-
-                             $rootScope.siteId = result.siteId;
-
-                                // birendra// initialize  exp img detail object
-                                $rootScope.initializeUserForExportImage(result.Id);
-
-                                 //LicenseId would be zero for admin that is why we set the haveRoleAdmin = true
-                                 if (result.LicenseId == 0) {
-                                     $rootScope.haveRoleAdmin = true;
+                            // birendra// initialize  exp img detail object
+                            $rootScope.initializeUserForExportImage(result.Id);
 
-                                     // set license id -1 for admin
-                                     $scope.UpdateUserExportImageData(result.Id,'LicenseId',-1)
+                                //LicenseId would be zero for admin that is why we set the haveRoleAdmin = true
+                                if (result.LicenseId == 0) {
+                                    $rootScope.haveRoleAdmin = true;
 
-                                    // set enable export image for admin
-                                    $scope.UpdateUserExportImageData(result.Id,'isExportImage',true);
+                                    // set license id -1 for admin
+                                    $scope.UpdateUserExportImageData(result.Id,'LicenseId',-1)
 
-                                     $rootScope.userData = result;
-                                     $rootScope.userModules = result.Modules;
+                                // set enable export image for admin
+                                $scope.UpdateUserExportImageData(result.Id,'isExportImage',true);
 
-                                     localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
-                                     
-                                     if (isCommingSoonModel == true) {
+                                    $rootScope.userData = result;
+                                    $rootScope.userModules = result.Modules;
 
-                                         ShowAssignedModulesPopup(result.Modules);
+                                    localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
+                                    
+                                    if (isCommingSoonModel == true) {
 
+                                        ShowAssignedModulesPopup(result.Modules);
 
-                                         sessionStorage.setItem("loginSession", "true");
-                                         localStorage.setItem('isCommingSoonModel', false);
 
-                                         $rootScope.isVisibleLogin = false;
-                                     }
+                                        sessionStorage.setItem("loginSession", "true");
+                                        localStorage.setItem('isCommingSoonModel', false);
 
+                                        $rootScope.isVisibleLogin = false;
+                                    }
 
-                                     $location.path('/');
 
-                                 }
-                                 else {
-                                     if (result.LicenseInfo != null ) {
+                                    $location.path('/');
 
-                                        //only site instructor allowed to change modesty
-                                        if(result.EditionId!=1 && result.EditionId!=2)
-                                        {
-                                            $("#modestyDiv").css("pointer-events", "none");
-                                            $("#modestyDiv").css("opacity", 0.5);
-                                            $("#modestyDiv").find("*").prop('disabled', true);
-                                        }                                       
+                                }
+                                else {
+                                    if (result.LicenseInfo != null ) {
 
-                                         // set license id
-                                         $scope.UpdateUserExportImageData(result.Id, 'LicenseId', result.LicenseId)
+                                    //only site instructor allowed to change modesty
+                                    if(result.EditionId!=1 && result.EditionId!=2)
+                                    {
+                                        $("#modestyDiv").css("pointer-events", "none");
+                                        $("#modestyDiv").css("opacity", 0.5);
+                                        $("#modestyDiv").find("*").prop('disabled', true);
+                                    }                                       
 
-                                         // set license type :note 5 for demo/test license
-                                         $scope.UpdateUserExportImageData(result.Id, 'LicenseTypeId', result.LicenseInfo.LicenseTypeId);
+                                        // set license id
+                                        $scope.UpdateUserExportImageData(result.Id, 'LicenseId', result.LicenseId)
 
-                                        if(result.UserExportImageDetail!=null)
-                                        {
-                                            // set already export image count
-                                           $scope.UpdateUserExportImageData(result.Id,'CountExportImage',result.UserExportImageDetail.CountExportedImage);
+                                        // set license type :note 5 for demo/test license
+                                        $scope.UpdateUserExportImageData(result.Id, 'LicenseTypeId', result.LicenseInfo.LicenseTypeId);
 
-                                           // set Image limit
-                                           $scope.UpdateUserExportImageData(result.Id,'ExptImageLimit',result.UserExportImageDetail.ExptImageLimit);
+                                    if(result.UserExportImageDetail!=null)
+                                    {
+                                        // set already export image count
+                                        $scope.UpdateUserExportImageData(result.Id,'CountExportImage',result.UserExportImageDetail.CountExportedImage);
 
-                                           // set  is enable for export image
-                                           $scope.UpdateUserExportImageData(result.Id,'isExportImage',result.UserExportImageDetail.isExportImage);
-                                        }
+                                        // set Image limit
+                                        $scope.UpdateUserExportImageData(result.Id,'ExptImageLimit',result.UserExportImageDetail.ExptImageLimit);
 
+                                        // set  is enable for export image
+                                        $scope.UpdateUserExportImageData(result.Id,'isExportImage',result.UserExportImageDetail.isExportImage);
+                                    }
 
-                                         $rootScope.userData = result;
-                                         $rootScope.userModules = result.Modules;
 
-                                         //1. set haveRoleAdmin = false because LicenseInfo is not null
-                                         $rootScope.haveRoleAdmin = false;
+                                        $rootScope.userData = result;
+                                        $rootScope.userModules = result.Modules;
 
-                                         //2.
-                                         localStorage.setItem('loggedInUserDetails', JSON.stringify(result));                                     
+                                        //1. set haveRoleAdmin = false because LicenseInfo is not null
+                                        $rootScope.haveRoleAdmin = false;
 
-                                         //5.
-                                         sessionStorage.setItem("loginSession", "true");
-                                         $rootScope.isVisibleLogin = false;
+                                        //2.
+                                        localStorage.setItem('loggedInUserDetails', JSON.stringify(result));                                     
 
-                                         //6. reset the isCommingSoonModel to false in local storage so that upcomming module pop up would not show again to the user after firts time
-                                       //  localStorage.setItem('isCommingSoonModel', false);
+                                        //5.
+                                        sessionStorage.setItem("loginSession", "true");
+                                        $rootScope.isVisibleLogin = false;
 
-                                         $location.path('/');
+                                        //6. reset the isCommingSoonModel to false in local storage so that upcomming module pop up would not show again to the user after firts time
+                                    //  localStorage.setItem('isCommingSoonModel', false);
 
-                                     }
-                                     else {
-                                         if ($('#dvTerms').length > 0) {
-                                             $('#dvTerms').html(result.TermsAndConditionsText);
-                                         }
-                                         $rootScope.isVisibleLogin = true;
-                                         $rootScope.LoginEnableUI();
-                                         $('#dvTermCondition').fadeIn();
-                                         $rootScope.userData = result;
-                                         $rootScope.haveRoleAdmin = false;
-                                         localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
-                                         $location.path('/');
-                                     }
-                                 }
-                                 $rootScope.LoginEnableUI();
-                                  // set user session time
-                                $rootScope.loadUserSession();
+                                        $location.path('/');
 
-                             }
+                                    }
+                                    else {
+                                        if ($('#dvTerms').length > 0) {
+                                            $('#dvTerms').html(result.TermsAndConditionsText);
+                                        }
+                                        $rootScope.isVisibleLogin = true;
+                                        $rootScope.LoginEnableUI();
+                                        $('#dvTermCondition').fadeIn();
+                                        $rootScope.userData = result;
+                                        $rootScope.haveRoleAdmin = false;
+                                        localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
+                                        $location.path('/');
+                                    }
+                                }
+                                $rootScope.LoginEnableUI();
+                                // set user session time
+                            $rootScope.loadUserSession();
 
+                            }
 
-                         }
                      }
+                  }
 
              },
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
index cec15b9..973ea15 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -397,7 +397,9 @@ AIA.constant("LoginConstants", {
     "ACCOUNT_NUMBER_NOT_EXIST": "1",
     "EDITION_NOT_EXIST": "3",
     "MASTER_SITEIP_NOT_EXIST": "2",
-    "LICENSE_INACTIVE": "6",
+    "LICENSE_INACTIVE": "6",  
+    "SITELICENSE_EXPIRED": "7",
+    "SITELICENSE_NOTSTARTED": "8",
     "INVALID_CLIENT": "Clinet is not valid",
     "MSG_NOT_AUTHORIZE_SITE_USER": "User is not authorized.",
 });
@@ -422,6 +424,7 @@ AIA.constant("LoginMessageConstants", {
     "PASSWORD_UPDATE_SUCCESS": "Password updated successfully",
     "PASSWORD_UPDATE_FAILED": "Password update failed",
     "SUBSCRIPTION_EXPIRATION_MESSAGE": "Your license is expired since ",
+    "SUBSCRIPTION_NOT_START_MESSAGE": "Your license Subscription is not started yet. It will continue on ",
     "LICENSE_INACTIVE_MESSAGE": "Your license is inactive.",
     "INVALID_USER": "Invalid UserID",
     "USER_INACTIVE_MESSAGE": "User ID is inactive.",
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.aspx b/400-SOURCECODE/AIAHTML5.Web/index.aspx
index 040b5ad..dc3bf71 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.aspx
+++ b/400-SOURCECODE/AIAHTML5.Web/index.aspx
@@ -286,7 +286,7 @@
                                         <input name="inlineRadioOptions" id="inlineRadio1" value="unblock" type="radio"> Unblock
                                     </label>
                                     <label class="radio-inline">
-                                        <input name="inlineRadioOptions" id="inlineRadio2" value="forgotpwd" type="radio"> Forgot Password
+                                        <input name="inlineRadioOptions" id="inlineRadio2" value="forgotpwd" type="radio" checked="true"> Forgot Password
                                     </label>
                                 </div>
                             </div>
diff --git a/400-SOURCECODE/Admin/src/app/app.component.ts b/400-SOURCECODE/Admin/src/app/app.component.ts
index 3cc61ad..6dcad5e 100644
--- a/400-SOURCECODE/Admin/src/app/app.component.ts
+++ b/400-SOURCECODE/Admin/src/app/app.component.ts
@@ -81,8 +81,10 @@ export class AppComponent implements OnInit {
       //   console.log("You\'ve gone idle!");
       // }); 
 
-      if(window.location.hostname=="localhost")
+      if(window.location.host=="localhost:4200")
         {
+          // for 'ng serve --open' command
+         //**** for localhost:4200 *****//
           //insert new session
           this.loginManageStatus('insert');
         }
@@ -149,7 +151,7 @@ export class AppComponent implements OnInit {
           this._loadingService.HideLoading("global-loading");
         }
        
-         if(window.location.hostname!="localhost")
+         if(window.location.host!="localhost:4200")
           {
             localStorage.removeItem('loggedInUserDetails');    
             window.location.href = window.location.origin;
diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html
index 9acaea0..2207eeb 100644
--- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html
+++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html
@@ -480,7 +480,8 @@
                   <div class="col-sm-12">
                     <div class="row">
                       <div class="col-sm-12 marginTop10 text-right">
-                        <button class="btn btn-primary btn-sm" type="submit" [disabled]="!insertUpdateLicenseFrm.valid || alerts != '' || this.editionLoginsText == ''"><i class="fa fa-plus-circle "></i> Add</button>
+                        <button *ngIf="license.LicenseId <= 0" class="btn btn-primary btn-sm" type="submit" [disabled]="!insertUpdateLicenseFrm.valid || alerts != '' || this.editionLoginsText == ''"><i class="fa fa-plus-circle "></i> Add</button>
+                        <button *ngIf="license.LicenseId > 0" class="btn btn-primary btn-sm" type="submit" [disabled]="!insertUpdateLicenseFrm.valid || alerts != '' || this.editionLoginsText == ''"><i class="fa fa-plus-circle "></i> Update</button>
                         <button *ngIf="license.LicenseId > 0" class="btn btn-primary btn-sm" type="button" (click)="CancelAddEdit()"><i class="fa fa-close"></i>Cancel</button>
                       </div>
                     </div>
diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts
index 45ca66b..c70171f 100644
--- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts
@@ -12,6 +12,7 @@ import { BsModalRef } from 'ngx-bootstrap/modal/bs-modal-ref.service';
 import { ContenteditableModelDirective } from '../../shared/contenteditabledirective';
 import { NumberOnlyDirective } from '../../shared/numberonlydirective';
 import { ConfirmService } from '../../shared/confirm/confirm.service';
+import { LoadingService } from '../../shared/loading.service';
 @Component({
   templateUrl: './addlicense.component.html'
 })
@@ -50,7 +51,7 @@ export class AddLicense implements OnInit {
   dateEndInvalid: boolean = false;
   dateRenewInvalid: boolean = false;
   NumberOfRows:number=0;
-  constructor(private licenseService: LicenseService, private globalService: GlobalService,
+  constructor(private _loadingService: LoadingService,private licenseService: LicenseService, private globalService: GlobalService,
      private router: Router, private activeRoute: ActivatedRoute, 
      private fb: FormBuilder, private modalService: BsModalService,private _confirmService: ConfirmService) {
 
@@ -528,25 +529,29 @@ export class AddLicense implements OnInit {
   AfterInsertData(data, template) {
     if (data.Status == "false") {
       this.alerts = "<span>License save unsuccessfull.</span>";
-    } else {
+    } 
+    else 
+    {
       if(this.insertUpdateLicenseFrm.controls['licenseTypeId'].value==4)
       {
         this._confirmService.activate("License saved successfully. Mail has been sent", "alertMsg");
       }
       else{
         this._confirmService.activate("License saved successfully.", "alertMsg");
-      }
-    
+      }    
     }
+    this._loadingService.HideLoading("global-loading");
   }
 
   AfterUpdateData(data, template) {
     if (data.Status == "false") {
       this.alerts = "<span>License update unsuccessfull.</span>";
-    } else {
-      this._confirmService.activate("License updated successfully.", "alertMsg");
-     
+    } 
+    else 
+    {
+      this._confirmService.activate("License updated successfully.", "alertMsg");    
     }
+    this._loadingService.HideLoading("global-loading");
   }
 
   OnLoginBlur() {
@@ -707,8 +712,17 @@ export class AddLicense implements OnInit {
     }   
     else {
       this.insertUpdateLicenseFrm.controls['editionLoginArr'].value.forEach(element => {
-        if (element.Login > 0) {
-          this.editionLoginsText += element.Id.toString() + '-' + element.Login + '|';
+        if (element.Checked > 0) {
+          if(element.Login=='')
+          {
+            //set 0 edition for update license
+            this.editionLoginsText += element.Id.toString() + '-' + 0 + '|';
+          }
+          else
+          {
+            this.editionLoginsText += element.Id.toString() + '-' + element.Login + '|';
+          }
+          
         }
       });
     }
@@ -724,7 +738,9 @@ export class AddLicense implements OnInit {
           if (response == 'True') {
             this.alerts += '<span>Account number already exists. Enter a different account number.</span>';
           }
-          if (this.alerts == '') {
+          if (this.alerts == '') 
+          {
+            this._loadingService.ShowLoading("global-loading");
             return this.licenseService.InsertLicense(obj)
               .subscribe(
               n => (this.AfterInsertData(n, template)),
@@ -733,13 +749,15 @@ export class AddLicense implements OnInit {
         },
         error => this.error = <any>error);
     }
-    else {
+    else 
+    {
       if (this.insertUpdateLicenseFrm.controls['renew'].value && this.insertUpdateLicenseFrm.controls['renewDate'].value == undefined) {
         this.alerts = 'Renew date is required';
       }
       if (this.alerts == '') {
-        console.log(this.insertUpdateLicenseFrm.controls['subscriptionStartDate'].value + ', ' + this.insertUpdateLicenseFrm.controls['subscriptionEndDate'].value + ', ' + this.insertUpdateLicenseFrm.controls['renewDate'].value);
-        console.log(obj.subscriptionStartDate + ', ' + obj.subscriptionEndDate + ', ' + obj.renewDate);
+        //console.log(this.insertUpdateLicenseFrm.controls['subscriptionStartDate'].value + ', ' + this.insertUpdateLicenseFrm.controls['subscriptionEndDate'].value + ', ' + this.insertUpdateLicenseFrm.controls['renewDate'].value);
+        // console.log(obj.subscriptionStartDate + ', ' + obj.subscriptionEndDate + ', ' + obj.renewDate);
+        this._loadingService.ShowLoading("global-loading");
         return this.licenseService.UpdateLicense(obj)
           .subscribe(
           n => (this.AfterUpdateData(n, template)),
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.ts
index da59d65..1430aaa 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.ts
@@ -99,22 +99,22 @@ export class DiscountCodeReport implements OnInit {
             width: "100%",
             height: this.scrHeight,
             colModal: [
-                { width: 180, align: 'center' },
+                { width: 200, align: 'center' },
                 { width: 230, align: 'center' },
-                { width: 150, align: 'Center' },
-                { width: 150, align: 'Center' },
+                { width: 250, align: 'Center' },
+                { width: 250, align: 'Center' },
                 { width: 350, align: 'Center' },
                 { width: 500, align: 'Center' },
-                { width: 130, align: 'Center' },
-                { width: 120, align: 'center' },
-                { width: 280, align: 'Center' },
-                { width: 180, align: 'center' },
-                { width: 200, align: 'center' },
-                { width: 170, align: 'center' },
-                { width: 80, align: 'center' },
-                { width: 150, align: 'center' },
-                { width: 150, align: 'center' },
-                { width: 180, align: 'Center' },
+                // { width: 130, align: 'Center' },
+                // { width: 120, align: 'center' },
+                // { width: 280, align: 'Center' },
+                // { width: 180, align: 'center' },
+                // { width: 200, align: 'center' },
+                // { width: 170, align: 'center' },
+                // { width: 80, align: 'center' },
+                // { width: 150, align: 'center' },
+                // { width: 150, align: 'center' },
+                // { width: 180, align: 'Center' },
                 //{ width: 400, align: 'Center' },
                 //{ width: 150, align: 'center' },
                 //{ width: 110, align: 'center' },
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/expiringsubscriptionreport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/expiringsubscriptionreport.component.ts
index 2cbe866..7d3086d 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/expiringsubscriptionreport.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/expiringsubscriptionreport.component.ts
@@ -116,22 +116,22 @@ export class ExpiringSubscriptionReport implements OnInit, AfterViewChecked {
             width: "100%",
             height: this.scrHeight,
             colModal: [
+                { width: 160, align: 'center' },
                 { width: 180, align: 'center' },
-                { width: 230, align: 'center' },
                 { width: 150, align: 'Center' },
-                { width: 150, align: 'Center' },
-                { width: 350, align: 'Center' },
-                { width: 500, align: 'Center' },
+                { width: 250, align: 'Center' },
+                { width: 160, align: 'Center' },
+                { width: 130, align: 'Center' },
                 { width: 130, align: 'Center' },
                 { width: 150, align: 'center' },
-                { width: 280, align: 'Center' },
-                { width: 180, align: 'center' },
-                { width: 200, align: 'center' },
-                { width: 170, align: 'center' },
-                { width: 80, align: 'center' },
-                { width: 150, align: 'center' },
+                { width: 160, align: 'Center' },
                 { width: 150, align: 'center' },
-                { width: 180, align: 'Center' },
+                { width: 160, align: 'center' },
+                // { width: 170, align: 'center' },
+                // { width: 80, align: 'center' },
+                // { width: 150, align: 'center' },
+                // { width: 150, align: 'center' },
+                // { width: 180, align: 'Center' },
                 //{ width: 400, align: 'Center' },
                 //{ width: 150, align: 'center' },
                 //{ width: 110, align: 'center' },
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.ts
index 5e55c58..e956f80 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.ts
@@ -92,14 +92,13 @@ export class ImageExportReport implements OnInit {
       width: "100%",
       height: this.scrHeight,
       colModal: [
-        { width: 180, align: 'center' },
-        { width: 230, align: 'center' },
+        { width: 250, align: 'center' },
+        { width: 200, align: 'center' },
+        { width: 200, align: 'Center' },
+        { width: 250, align: 'Center' },
+        { width: 200, align: 'Center' },
         { width: 150, align: 'Center' },
-        //{ width: 150, align: 'Center' },
-        { width: 350, align: 'Center' },
-        { width: 300, align: 'Center' },
-        { width: 130, align: 'Center' },
-        { width: 120, align: 'center' },        
+        { width: 200, align: 'center' },        
         { width: 150, align: 'center' },
         { width: 180, align: 'center' },
       ],
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts
index 5dfd335..688bdc4 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts
@@ -101,20 +101,20 @@ export class NetAdSubscriptionReport implements OnInit {
           colModal: [
             { width: 180, align: 'center' },
             { width: 230, align: 'center' },
-            { width: 150, align: 'Center' },
+            { width: 250, align: 'Center' },
             { width: 150, align: 'Center' },
             { width: 350, align: 'Center' },
             { width: 200, align: 'Center' },
-            { width: 200, align: 'Center' },
+            { width: 250, align: 'Center' },
             { width: 120, align: 'center' },
-            { width: 280, align: 'Center' },
-            { width: 180, align: 'center' },
-            { width: 200, align: 'center' },
-            { width: 170, align: 'center' },
-            { width: 80, align: 'center' },
-            { width: 150, align: 'center' },
-            { width: 150, align: 'center' },
-            { width: 180, align: 'Center' },
+            // { width: 280, align: 'Center' },
+            // { width: 180, align: 'center' },
+            // { width: 200, align: 'center' },
+            // { width: 170, align: 'center' },
+            // { width: 80, align: 'center' },
+            // { width: 150, align: 'center' },
+            // { width: 150, align: 'center' },
+            // { width: 180, align: 'Center' },
           ],
           sort: true
         });
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts
index bf7c014..9bf0c31 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts
@@ -98,21 +98,21 @@ export class SiteLicenseUsageReport implements OnInit {
           height: this.scrHeight,
           colModal: [
             { width: 180, align: 'center' },
-            { width: 230, align: 'center' },
-            { width: 150, align: 'Center' },
+            { width: 250, align: 'center' },
+            { width: 250, align: 'Center' },
             { width: 150, align: 'Center' },
             { width: 350, align: 'Center' },
             { width: 500, align: 'Center' },
             { width: 130, align: 'Center' },
-            { width: 120, align: 'center' },
-            { width: 280, align: 'Center' },
-            { width: 180, align: 'center' },
-            { width: 200, align: 'center' },
-            { width: 170, align: 'center' },
-            { width: 80, align: 'center' },
-            { width: 150, align: 'center' },
-            { width: 150, align: 'center' },
-            { width: 180, align: 'Center' },
+            // { width: 120, align: 'center' },
+            // { width: 280, align: 'Center' },
+            // { width: 180, align: 'center' },
+            // { width: 200, align: 'center' },
+            // { width: 170, align: 'center' },
+            // { width: 80, align: 'center' },
+            // { width: 150, align: 'center' },
+            // { width: 150, align: 'center' },
+            // { width: 180, align: 'Center' },
           ],
           sort: true
         });
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/subscriptioncancellationreport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/subscriptioncancellationreport.component.ts
index deb4ae5..19de678 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/subscriptioncancellationreport.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/subscriptioncancellationreport.component.ts
@@ -108,22 +108,22 @@ export class SubscriptionCancellationReport implements OnInit {
             width: "100%",
             height: this.scrHeight,
             colModal: [
-                { width: 180, align: 'center' },
-                { width: 230, align: 'center' },
-                { width: 150, align: 'Center' },
+                { width: 140, align: 'center' },
+                { width: 170, align: 'center' },
                 { width: 150, align: 'Center' },
-                { width: 350, align: 'Center' },
-                { width: 500, align: 'Center' },
+                { width: 160, align: 'Center' },
                 { width: 130, align: 'Center' },
+                { width: 400, align: 'Center' },
+                { width: 100, align: 'Center' },
+                { width: 140, align: 'center' },
+                { width: 100, align: 'Center' },
+                { width: 140, align: 'center' },
                 { width: 150, align: 'center' },
-                { width: 280, align: 'Center' },
-                { width: 180, align: 'center' },
-                { width: 200, align: 'center' },
-                { width: 170, align: 'center' },
-                { width: 80, align: 'center' },
-                { width: 150, align: 'center' },
-                { width: 150, align: 'center' },
-                { width: 180, align: 'Center' },
+                // { width: 170, align: 'center' },
+                // { width: 80, align: 'center' },
+                // { width: 150, align: 'center' },
+                // { width: 150, align: 'center' },
+                // { width: 180, align: 'Center' },
                 //{ width: 400, align: 'Center' },
                 //{ width: 150, align: 'center' },
                 //{ width: 110, align: 'center' },
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/subscriptionreport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/subscriptionreport.component.ts
index 240808a..f3edb75 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/subscriptionreport.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/subscriptionreport.component.ts
@@ -110,22 +110,22 @@ export class SubscriptionReport implements OnInit {
             width: "100%",
             height: this.scrHeight,
             colModal: [
-                { width: 180, align: 'center' },
-                { width: 230, align: 'center' },
+                { width: 140, align: 'center' },
+                { width: 170, align: 'center' },
                 { width: 150, align: 'Center' },
                 { width: 150, align: 'Center' },
-                { width: 350, align: 'Center' },
-                { width: 500, align: 'Center' },
-                { width: 130, align: 'Center' },
-                { width: 150, align: 'center' },
-                { width: 280, align: 'Center' },
-                { width: 180, align: 'center' },
-                { width: 200, align: 'center' },
-                { width: 170, align: 'center' },
-                { width: 80, align: 'center' },
+                { width: 140, align: 'Center' },
+                { width: 400, align: 'Center' },
+                { width: 100, align: 'Center' },
                 { width: 150, align: 'center' },
+                { width: 100, align: 'Center' },
+                { width: 140, align: 'center' },
                 { width: 150, align: 'center' },
-                { width: 180, align: 'Center' },
+                // { width: 170, align: 'center' },
+                // { width: 80, align: 'center' },
+                // { width: 150, align: 'center' },
+                // { width: 150, align: 'center' },
+                // { width: 180, align: 'Center' },
                 //{ width: 400, align: 'Center' },
                 //{ width: 150, align: 'center' },
                 //{ width: 110, align: 'center' },
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/usagereport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/usagereport.component.ts
index 97fb0f8..b38afed 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/usagereport.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/usagereport.component.ts
@@ -184,25 +184,25 @@ export class UsageReport implements OnInit, AfterViewChecked {
           width: "100%",
           height: this.scrHeight,
           colModal: [
-            { width: 180, align: 'center' },
-            { width: 230, align: 'center' },
+            { width: 150, align: 'center' },
+            { width: 150, align: 'center' },
             { width: 150, align: 'Center' },
             { width: 150, align: 'Center' },
-            { width: 350, align: 'Center' },
-            { width: 500, align: 'Center' },
+            { width: 300, align: 'Center' },
+            { width: 150, align: 'Center' },
             { width: 130, align: 'Center' },
             { width: 120, align: 'center' },
-            { width: 280, align: 'Center' },
-            { width: 180, align: 'center' },
-            { width: 200, align: 'center' },
-            { width: 170, align: 'center' },
-            { width: 120, align: 'center' },
-            { width: 150, align: 'center' },
-            { width: 150, align: 'center' },
-            { width: 180, align: 'Center' },
-            { width: 400, align: 'Center' },
+            { width: 150, align: 'Center' },
+            { width: 140, align: 'center' },
+            { width: 100, align: 'center' },
             { width: 150, align: 'center' },
-            { width: 110, align: 'center' },
+            { width: 120, align: 'center' },
+            // { width: 150, align: 'center' },
+            // { width: 150, align: 'center' },
+            // { width: 180, align: 'Center' },
+            // { width: 400, align: 'Center' },
+            // { width: 150, align: 'center' },
+            // { width: 110, align: 'center' },
           ],
           sort: true
         });
diff --git a/400-SOURCECODE/Admin/src/app/shared/global.ts b/400-SOURCECODE/Admin/src/app/shared/global.ts
index 5e0effc..7f61192 100644
--- a/400-SOURCECODE/Admin/src/app/shared/global.ts
+++ b/400-SOURCECODE/Admin/src/app/shared/global.ts
@@ -48,7 +48,7 @@ export class GlobalService {
     
     this.NoRecords = 'No Record Found.';
    
-    this.hostURL = "http://192.168.43.9/API/Adminapi/";//Birendra Machine IP 
+    this.hostURL = "http://localhost/API/Adminapi/"; 
     this.LiveAPIURL = "http://interactiveanatomy.com/API/Adminapi/";
     this.QAAPIURL = "http://qa.beta.interactiveanatomy.com/API/Adminapi/";    
     this.LocalURL = "http://localhost:4200";
@@ -56,7 +56,7 @@ export class GlobalService {
      // get protocol type
        this.ProtocolType = window.location.protocol+"//";
 
-     if(window.location.hostname=="localhost")
+     if(window.location.host=="localhost:4200")
       {
         // for 'ng serve --open' command
          //**** for localhost:4200 *****//
@@ -69,8 +69,8 @@ export class GlobalService {
       
       }
 
-    if (this.resourceBaseUrl == this.ProtocolType+"192.168.43.9/API/Adminapi/") {  
-      if(window.location.hostname=="localhost")
+    if (this.resourceBaseUrl == this.ProtocolType+"localhost/API/Adminapi/") {  
+      if(window.location.host=="localhost:4200")
       {
          // for 'ng serve --open' command
          //**** for localhost:4200 *****//