diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 61ce636..e4c4279 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1462,8 +1462,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 //   console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)
 
 
-                if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
-
+                    if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
+                     
                     if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
                         $scope.isEligibleForHighlight = true;
                     }
@@ -4925,7 +4925,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $rootScope.isHighlightBodyByBodySystem = false;
 
         if ($rootScope.isHighLight == true) {
-
+           
         }
         else {
             $rootScope.isHighLight = true;
@@ -4994,6 +4994,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
 
         if ($rootScope.isNormalMode == true) {
+           
+           
+
+
 
         }
         else {
@@ -5018,7 +5022,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
             //7.
             $scope.CalculateImageCordinates($rootScope.viewOrientationId);
-
+      //      alert($rootScope.viewOrientationId + "gadash")
             $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition);
             $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
 
@@ -7422,7 +7426,33 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
     //list manager
     $scope.$on('listManagerEvent', function (event, data) {
-
+        
+        if ($rootScope.disableAnnotationtoolOnListManager == true)
+        {
+            $('#AnnotaionPopupDiv').find('input, textarea, button, select').attr('disabled', 'disabled');
+            $('#slider-range-min-2').slider('disable');
+            if ($rootScope.setListManagerZindex == true)
+            {
+                var canvasPaintZindex = $('#canvasPaint').css("z-index");  //x
+
+                var canvasZindex = $('#canvas').css("z-index");  //y
+                var listManagerZindex = $('#listManager').css("z-index"); //z
+                if (canvasPaintZindex > canvasZindex) {
+                    //y = parseInt(canvasPaintZindex) + 1;
+                    //if (listManagerZindex <= canvasPaintZindex) {
+                    //    listManagerZindex = parseInt(canvasPaintZindex) + 1;
+                    //    $('#listManager').css("z-index", z);
+                    //}
+                    //else {
+                    $('#listManager').css("z-index", canvasPaintZindex);
+                   // }
+                } else {
+                    //y = parseInt(y) + 1;
+                    $('#listManager').css("z-index", canvasZindex);
+                }
+               
+            }
+        }
         $('#spinner').css('visibility', 'visible');
         console.log('listManagerEvent');
 
@@ -7535,6 +7565,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $scope.terminateCurrentlyRunningWPs();
         //debugger
         $rootScope.isListManagerSelected = true;
+        //---
+        if ($rootScope.isListManagerSelected == true) {
+            $("#btnHighLight").addClass("btn-primary");
+            $("#btnHighLight").removeClass("btn-black");
+            if (!$("#btnNormalMode").hasClass("btn-black")) {
+                $("#btnNormalMode").addClass("btn-black");
+            }
+
+            if ($("#btnNormalMode").hasClass("btn-primary")) {
+                $("#btnNormalMode").removeClass("btn-primary");
+            }
+        }
+        //---
         $rootScope.isLoading = true;
 
         $('#spinner').css('visibility', 'visible');
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 482a4fe..cf6b80d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -26,6 +26,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         $rootScope.clickDrag = new Array();
         $rootScope.isLineDrawSelecyed = false;
         $rootScope.isAnnotationWindowClose = false;
+        $rootScope.setListManagerZindex = false;
         $rootScope.lastX;
         $rootScope.lastY;
         $rootScope.CommonData;
@@ -158,19 +159,21 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
 
 
         //----Annotation Toolbar: Jcanvas-----
-
+       
         $rootScope.DrLine = function (e) {
-          
+            $rootScope.setListManagerZindex = true;
             $("#canvasPaint").css("display", "block");
             $("#canvas").css("display", "block");
         
             $rootScope.switchCanvas();
             $rootScope.shapeType = "Line";
-         
+          
+
             $('.btnCursor').removeClass('activebtncolor');
            $(".btn-annotation").removeClass("activebtncolor");
            $(".btn-annotation-line").addClass("activebtncolor");
 
+
         }
 
 
@@ -180,6 +183,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
 
             $rootScope.switchCanvas();
             $rootScope.switchCanvas();
+            $rootScope.setListManagerZindex = true;
             $rootScope.shapeType = "Pin";
 
             $('.btnCursor').removeClass('activebtncolor');
@@ -196,8 +200,9 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
             $('.btnCursor').addClass('activebtncolor');
         }
 
+       
         $rootScope.DrawRectangle = function (e) {
-          
+            $rootScope.setListManagerZindex = true;
             $("#canvasPaint").css("display", "block");
             $("#canvas").css("display", "block");
             $rootScope.switchCanvas();
@@ -209,6 +214,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         $rootScope.paintBrush = function () {
             //      debugger;
             //  $('.btnCursor').addClass('activebtncolor');
+            $rootScope.setListManagerZindex = true;
             $("#canvasPaint").css("display", "block");
             $("#canvas").css("display", "block");
             $rootScope.switchCanvasToPaintCanvas();
@@ -244,6 +250,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         }
 
         $rootScope.DrawCircle = function (e) {
+            $rootScope.setListManagerZindex = true;
             $("#canvasPaint").css("display", "block");
             $("#canvas").css("display", "block");
             $rootScope.switchCanvas();
@@ -254,6 +261,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         }
 
         $rootScope.DrawArrow = function (e) {
+            $rootScope.setListManagerZindex = true;
             $("#canvasPaint").css("display", "block");
             $("#canvas").css("display", "block");
             $rootScope.switchCanvas();
@@ -263,6 +271,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
             $(".btn-annotation-arrow").addClass("activebtncolor");
         }
         $rootScope.DrawText = function () {
+            $rootScope.setListManagerZindex = true;
             $("#canvasPaint").css("display", "block");
             $("#canvas").css("display", "block");
             $rootScope.switchCanvas();
@@ -276,6 +285,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         }
 
         $rootScope.DrawPolygon = function () {
+            $rootScope.setListManagerZindex = true;
             $("#canvasPaint").css("display", "block");
             $("#canvas").css("display", "block");
             $rootScope.shapeType = "DrawPolygon";
@@ -441,9 +451,11 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         //list manager function
 
         //list manager function
-
+       
+        $rootScope.disableAnnotationtoolOnListManager = false;
         $rootScope.ShowListManager = function () {
             console.log('ShowListManager')
+            $rootScope.disableAnnotationtoolOnListManager = true;
 
             $rootScope.isLoading = true;
             $('#spinner').css('visibility', 'visible');
@@ -460,6 +472,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
 
         $rootScope.CloseListManager = function () {
             console.log('close')
+            
+            $rootScope.disableAnnotationtoolOnListManager = false;
+            if ($rootScope.disableAnnotationtoolOnListManager == false) {
+                $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').removeAttr('disabled', 'disabled');
+                $('#slider-range-min-2').slider('enable');
+            }
             //$rootScope.isListManagerSelected = false;
             $('#listManager').css('display', 'none');
             $("#listManager").css("visibility", "hidden");
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 3531f7f..3e8cbb6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -408,18 +408,18 @@
                     <button type="button" class="close" aria-label="Close" ng-click="CloseAnnotationTool()"><span aria-hidden="true">&times;</span></button>
                     <h4 class="modal-title" id="myModalLabel">Annotation</h4>
                 </div>
-                <div class="modal-body">
+                <div class="modal-body" id="AnnotaionPopupDiv" >
                     <div class="row">
                         <div class="col-sm-12">
                             <h5>Mode</h5>
 
                             <div class="btn-group btn-group-justified" role="group" aria-label="...">
                                 <div class="btn-group" role="group" tooltip>
-                                    <div id="identify-block"  style="display: none; font-size:13px;">Identify Mode</div>
-                                    <button id="OnIdentify" type="button"  class="btn btn-sm btn-success" ng-click="OnIdentifyClick()">Identify</button>
+                                    <div id="identify-block" style="display: none; font-size:13px;">Identify Mode</div>
+                                    <button  id="OnIdentify" type="button" class="btn btn-sm btn-success" ng-click="OnIdentifyClick()">Identify</button>
                                 </div>
                                 <div class="btn-group" role="group">
-                                    <div id="draw-block"  style="display: none; font-size: 13px;">Draw Mode</div>
+                                    <div id="draw-block" style="display: none; font-size: 13px;">Draw Mode</div>
                                     <button id="DrawMode" type="button" ng-click="DrawingMode()" class="btn btn-sm btn-success">Draw</button>
                                 </div>
                             </div>
@@ -444,7 +444,7 @@
                                 </div>
                             </div>
                             <div class="well-popup well">
-                                <img src="content/images/blank-shape.jpg" alt="..." class="img-rounded img-responsive" ng-click="enableAnnotationToolBar()">
+                                <img src="content/images/blank-shape.jpg" alt="..." class="img-rounded img-responsive" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
                             </div>
                             <div class="well well-popup">
                                 <div class="" role="group" aria-label="...">
@@ -1394,6 +1394,7 @@
         });
     </script>
 
+    
 
 
 </body>