diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 23df6aa..5a4d382 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -3617,7 +3617,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
 
                     }
 
-
+                    else {
+                        $scope.EnableUI();
+                    }
                 })
 
             }
@@ -4396,8 +4398,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
 
           
                 $('#btnTranparency').addClass('tButtonActive');
-                $('#btnIdentity').removeClass(' btn-primary');
-                $('#btnIdentity').addClass('btn-black');
+                $('#btnIdentify').removeClass(' btn-primary');
+                $('#btnIdentify').addClass('btn-black');
 
                 var canvasDiv = document.getElementById('canvasDiv');
                 $scope.verticalScrollPosition = canvasDiv.scrollTop;
@@ -4798,8 +4800,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
             //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
             $('#btnTranparency').removeClass('tButtonActive');
             $('#btnTranparency').addClass('btn-black');
-            $('#btnIdentity').removeClass('btn-black');
-            $('#btnIdentity').addClass('btn-primary');
+            $('#btnIdentify').removeClass('btn-black');
+            $('#btnIdentify').addClass('btn-primary');
 
             // clear canvas before drawing transparency box 
             if ($rootScope.isAnnotationWindowOpen == true) {
@@ -5909,7 +5911,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                 if (TBStartX <= bodyRegionRight && value.X <= TBRight && TBStartY <= bodyRegionBottom && value.Y <= TBBottom) {
 
                     if ($scope.isTBDrawnOnBodyRegion == false) {
-                        $scope.layerNumber = $scope.layerNumber + 1;
+
+
+                        if ($scope.layerNumber < $rootScope.totalLayers) {
+
+                            $scope.layerNumber = $scope.layerNumber + 1;
+
+                        }
+                       
                     }
 
                     if (value.bodyRegionId == '3') {
@@ -6684,9 +6693,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
             // document.getElementById('btnTranparency').className = 't-transparency'
             $('#btnTranparency').removeClass('tButtonActive');
             $('#btnTranparency').addClass('btn-black');
-            $('#btnIdentity').removeClass('btn-black');
+            $('#btnIdentify').removeClass('btn-black');
 
-            $('#btnIdentity').addClass('btn-primary');
+            $('#btnIdentify').addClass('btn-primary');
 
             document.getElementById('btnTranparency').removeEventListener("click", $scope.createTransparencyBox);
 
@@ -6777,14 +6786,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
         };
 
 
-        $scope.IdentityClick = function () {
+        $scope.IdentifyClick = function () {
 
 
             //if listanager is visisble then close it
 
             $rootScope.isListManagerSelected = false;
             $rootScope.CloseListManager();
-            // $('#btnIdentity').addClass('btn-primary');
+            // $('#btnIdentify').addClass('btn-primary');
 
             if ($scope.isTransparencyBtnClicked == true) {
 
@@ -6798,6 +6807,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                 canvasDiv.removeEventListener("mouseup", mouseUpListener)
                 $('#btnTranparency').removeClass('tButtonActive');
                 $('#btnTranparency').addClass('btn-black');
+
+                $("#btnExtract").removeClass("disabled");
+                $("#btnExtract").css("pointer-events", "auto");
             }
 
         }
@@ -9726,11 +9738,11 @@ function OnEnableHighlight() {
     });
 }
 
-function OnIdentityClick() {
-    console.log('OnIdentityClick is called outside ');
+function OnIdentifyClick() {
+    console.log('OnIdentifyClick is called outside ');
     var scope = angular.element(document.getElementById("daView")).scope();
     scope.$apply(function () {
-        scope.IdentityClick();
+        scope.IdentifyClick();
     });
 }
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
index 1d78188..aa523ce 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -139,7 +139,7 @@
         <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar" style="top:20px;"></div>
         <div class="" style="top:20px">
             <div class="col-xs-6">
-                <button id="btnIdentity" onclick="OnIdentityClick()" class="btn btn-primary btn-sm tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Identify"> <img src="content/images/icon-identity.png" alt=""></button>
+                <button id="btnIdentify" onclick="OnIdentifyClick()" class="btn btn-primary btn-sm tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Identify"> <img src="content/images/icon-identity.png" alt=""></button>
             </div>
             <div class="col-xs-6 pull-right">
                 <button class="btn btn-black btn-sm pull-right tooltip-custom" onclick="OnZoom()" id="btnZoom" data-toggle="tooltip" data-placement="bottom" title="Zoom-in/Zoom-out">