diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 75cd7e0..50e5ad1 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -3179,7 +3179,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
 
                 //history maintained issue
-               if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) { document.getElementById('sppeachBubble').style.zIndex = "60000"; }
+                if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) { document.getElementById('sppeachBubble').style.zIndex = "60000"; }
                
 
 
@@ -7008,6 +7008,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $scope.LateralArmView = "";
             $scope.MedialArmView = "active";
         }
+        //13573 : DA > Annotations should not be display if we change the body view.
+        $rootScope.CloseAnnotationTool();
+      
     }
 
     //Reload DA controller event listener after setting change
@@ -7543,40 +7546,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
     //list manager
     $scope.$on('listManagerEvent', function (event, data) {
-       
-
-        //if ($rootScope.MenuModuleName == "DA") {
-        //    if ($rootScope.disableAnnotationtoolOnListManager == true) {
-        //        $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').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);
-                }
-               
-            }
-        
-      
-
-
-
+  
         if ($rootScope.islistManagerEventAlredayDispachted == 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 d69c1f5..0858f20 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -418,6 +418,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $rootScope.isAnnotaionToolBarDrawingModeActive = false;
       
             $rootScope.switchCanvas();
+            $rootScope.shapeType = '';
         }
         $rootScope.CIAnotationIdentifyModeOff = false;
         $rootScope.OnIdentifyClick = function () {
@@ -1470,6 +1471,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $rootScope.lastX; $rootScope.lastY;
         var ctx;
         $rootScope.OnPaintCanvasMouseDown = function (event) {
+            
             if ($rootScope.isAnnotatiomToolBarPopupClosed == false) {
                 var canvasElement = document.getElementById("canvas");
                 var ctx = canvasElement.getContext("2d");
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 0a59dd8..0a303d3 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -741,7 +741,7 @@
                     top: 170px;
                     left: 140px;
                     display: none;
-                    z-index: 110000;
+                    z-index: 780000;
                 }
 
                     #listManager .annotation-modal-header {