diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 71e1098..3510854 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -2225,16 +2225,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
 
     $scope.HighlightBodyByTermList = function (TermList) {
-
-        //if (($rootScope.updatedGrayMRDataList != null || $rootScope.updatedGrayMRDataList != undefined) && $rootScope.updatedGrayMRDataList.length > 0) {
-        //    $rootScope.updatedGrayMRDataList = null;
-        //    $rootScope.updatedGrayMRDataList = [];
-        //}
-        //if (($rootScope.updatedGrayDataList != null || $rootScope.updatedGrayDataList != undefined) && $rootScope.updatedGrayDataList.length > 0) {
-        //    $rootScope.updatedGrayDataList = null;
-        //    $rootScope.updatedGrayDataList = [];
-        //}
-
+       
         $scope.layerNumber = $('#txtlayerNumber').val();
 
         $rootScope.isLoading = true;
@@ -2451,6 +2442,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
                                     $('#spinner').css('visibility', 'hidden');
                                 }
+                                else {
+                                    var canvasDiv = document.getElementById('canvasDiv');
+                                      $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
+                                      $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition);
+
+                                      $rootScope.isLoading = false;
+
+                                      $('#spinner').css('visibility', 'hidden');
+                                    //$('#canvasDiv').scrollLeft(newX);
+                                      //$('#canvasDiv').scrollTop(newY);
+                                }
 
                               //  $rootScope.isHighlightBodyByBodySystem = false;
 
@@ -5898,7 +5900,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
     $scope.OnGenderChange = function (event) {
 
-
+        var canvasDiv = document.getElementById('canvasDiv');
+        $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
+        $scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft;
 
         $("#btnExtract").removeClass("disabled");
         $("#btnTranparency").removeClass("disabled");
@@ -5923,6 +5927,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         if ($rootScope.isExtract == true) {
             $rootScope.isExtract = false;
             $rootScope.isHighLight = true;
+            $("#btnExtract").removeClass("btn-primary");
+            $("#btnExtract").addClass("btn-black");
+            $("#btnHighLight").removeClass("btn-black");
+            $("#btnHighLight").addClass("btn-primary");
+            
+         
         }
 
 
@@ -6115,6 +6125,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
     $scope.OnViewChange = function (event) {
 
+        var canvasDiv = document.getElementById('canvasDiv');
+        $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
+        $scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft;
      
         $("#btnExtract").removeClass("disabled");
         $("#btnTranparency").removeClass("disabled");
@@ -6142,8 +6155,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         if ($rootScope.isExtract == true) {
             $rootScope.isExtract = false;
             $rootScope.isHighLight = true;
+            $("#btnExtract").removeClass("btn-primary");
+            $("#btnExtract").addClass("btn-black");
+            $("#btnHighLight").removeClass("btn-black");
+            $("#btnHighLight").addClass("btn-primary");
         }
-
+      
         $scope.layerNumber = 0;
         //  debugger;
         //var selectedViewId = $scope.bodyViews[event.currentTarget.attributes[1].value];