diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index a69f2c4..9614136 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -782,10 +782,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $scope.modestyImageInfo = [];
         // annotation toolbar canvas
         if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) {
-            $("#canvasDiv").append('<canvas id="canvasPaint" width="2277" height="3248" class="canvas-annotationStyle1"></canvas><canvas id="canvas" ng-click="BindCanvasDrawingListners($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas>');
-            //var annotationAppendedCanvas = 
-          //  $compile(annotationAppendedCanvas)($scope);
-          //  $scope.BindCanvasDrawingListners();
+            var annotationAppendedCanvas = $("#canvasDiv").append('<canvas id="canvasPaint" width="2277" height="3248" class="canvas-annotationStyle1"></canvas><canvas id="canvas" ng-click="BindCanvasDrawingListners($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas>');
+            $compile(annotationAppendedCanvas)($scope);
+            $scope.BindCanvasDrawingListners();
             //  $rootScope.FreeStylePaint();
                 
         }
@@ -2996,7 +2995,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
 
 
-                if ($rootScope.isAnnotaionToolBarPopupClosed == true) {
+                if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
                     $("#sppeachBubble").remove();
                     $("#dot").remove();
                 }
@@ -3110,7 +3109,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 //history maintained issue
 
 
-                if ($rootScope.isAnnotaionToolBarPopupClosed == true) { document.getElementById('sppeachBubble').style.zIndex = "100000000000"; }
+                if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) { document.getElementById('sppeachBubble').style.zIndex = "100000000000"; }
 
 
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 9a30a1e..5087a3b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -169,7 +169,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         //annotation tool custom events
         $rootScope.ShowAnnotationWindow = function () {
 
-            $rootScope.isAnnotaionToolBarPopupClosed == true;
+         //   $rootScope.isAnnotaionToolBarDrawingModeActive == true;
 
             //7904
             if ($rootScope.MenuModuleName == "DA") {
@@ -239,7 +239,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
             //  $("#canvas").css("display", "none");
             $('.btnCursor').removeClass('activebtncolor');
             $(".btn-annotation").removeClass("activebtncolor");
-            $rootScope.isAnnotaionToolBarPopupClosed = true;
+            $rootScope.isAnnotaionToolBarDrawingModeActive = true;
         }
         $rootScope.CIAnotationIdentifyModeOff = false;
         $rootScope.OnIdentifyClick = function () {
@@ -261,13 +261,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                 $('.btnCursor').removeClass('activebtncolor');
 
             }
-            $rootScope.isAnnotaionToolBarPopupClosed = true;
+            $rootScope.isAnnotaionToolBarDrawingModeActive = true;
         }
 
 
 
         $rootScope.DrawingMode = function () {
-            $rootScope.isAnnotaionToolBarPopupClosed = false;
+            $rootScope.isAnnotaionToolBarDrawingModeActive = false;
             $("#OnIdentify").removeClass("annotationtoolbartab");
             $("#DrawMode").addClass("annotationtoolbartab");
             $('.btnCursor').addClass('activebtncolor');
@@ -560,7 +560,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                 x2: x, y2: y,
 
                 click: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
                         $rootScope.canvasLayerNameCollection = [];
                         $rootScope.canvasLayerNameCollection.push(layer.name);
@@ -580,7 +580,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
 
                 },
                 mouseout: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
                         $rootScope.canvasLayerNameCollection = [];
                         $(canvasId).setLayer(layer.name, {
@@ -599,7 +599,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     }
                 },
                 mouseover: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
 
                         $(canvasId).setLayer(layer.name, {
@@ -647,7 +647,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                 },
 
                 click: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
                         $rootScope.canvasLayerNameCollection = [];
                         $rootScope.canvasLayerNameCollection.push(layer.name);
@@ -667,7 +667,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     }
                 },
                 mouseout: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
                         $rootScope.canvasLayerNameCollection = [];
                         $(canvasId).setLayer(layer.name, {
@@ -688,7 +688,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                 },
                 mouseover: function (layer) {
 
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
                         $(canvasId).setLayer(layer.name, {
                             handle: {
@@ -734,7 +734,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
 
 
                 click: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
                         $rootScope.canvasLayerNameCollection = [];
                         $rootScope.canvasLayerNameCollection.push(layer.name);
@@ -753,7 +753,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     }
                 },
                 mouseout: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
                         $rootScope.canvasLayerNameCollection = [];
                         $(canvasId).setLayer(layer.name, {
@@ -775,7 +775,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     }
                 },
                 mouseover: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
 
                         $(canvasId).setLayer(layer.name, {
@@ -816,7 +816,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                 x2: x, y2: y,
 
                 click: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
                         $rootScope.canvasLayerNameCollection = [];
                         $rootScope.canvasLayerNameCollection.push(layer.name);
@@ -837,7 +837,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     }
                 },
                 mouseout: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
                         $rootScope.canvasLayerNameCollection = [];
                         $(canvasId).setLayer(layer.name, {
@@ -857,7 +857,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     }
                 },
                 mouseover: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
 
                         $(canvasId).setLayer(layer.name, {
@@ -908,7 +908,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     x2: x, y2: y,
 
                     click: function (layer) {
-                        if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                        if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                             layer.draggable = true;
                             $rootScope.shapeTypePin = "Pin";
                             $rootScope.canvasLayerNameCollection = [];
@@ -936,7 +936,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                         }
                     },
                     mouseout: function (layer) {
-                        if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                        if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                             layer.draggable = true;
                             $rootScope.canvasLayerNameCollection = [];
                             $(canvasId).setLayer(layer.name, {
@@ -957,7 +957,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     },
                     mouseover: function (layer) {
 
-                        if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                        if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                             layer.draggable = true;
                             $(canvasId).setLayer(layer.name, {
                                 handle: {
@@ -1057,7 +1057,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
 
                 },
                 click: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
                         $rootScope.canvasLayerNameCollection = [];
                         $rootScope.canvasLayerNameCollection.push(layer.name);
@@ -1077,7 +1077,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     }
                 },
                 dblclick: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
                         $rootScope.IsTextAlreadySave = false;
                         var RectNameArray = (layer.name).split("_");
@@ -1117,7 +1117,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     }
                 },
                 mouseout: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
                         $rootScope.canvasLayerNameCollection = [];
                         $('#canvas').setLayer(layer.name, {
@@ -1137,7 +1137,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     }
                 },
                 mouseover: function (layer) {
-                    if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                    if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                         layer.draggable = true;
                         $('#canvas').setLayer(layer.name, {
                             handle: {
@@ -1272,7 +1272,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
 
                 case "Line":
                     //$rootScope.canvasLayerNameCollection = [];
-                    $rootScope.isAnnotaionToolBarPopupClosed = false;
+                    $rootScope.isAnnotaionToolBarDrawingModeActive = false;
                     $rootScope.LineNumber = $rootScope.ObjectIndex++;
 
                     $rootScope.LineFn('#canvas', $rootScope.LineNumber, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y)
@@ -1280,21 +1280,21 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     break;
 
                 case "Rectangle":
-                    $rootScope.isAnnotaionToolBarPopupClosed = false;
+                    $rootScope.isAnnotaionToolBarDrawingModeActive = false;
                     $rootScope.rectNumber = $rootScope.ObjectIndex++;
                     $rootScope.RectangleFn('#canvas', $rootScope.rectNumber, $rootScope.shapestyleFillColor, $rootScope.shapestyleborderColor, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
 
                     break;
 
                 case "Circle":
-                    $rootScope.isAnnotaionToolBarPopupClosed = false;
+                    $rootScope.isAnnotaionToolBarDrawingModeActive = false;
                     //   alert($rootScope.shapestyleborderWidth);
                     $rootScope.CircleNumber = $rootScope.ObjectIndex++;
 
                     $rootScope.CircleFn('#canvas', $rootScope.CircleNumber, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.shapestyleFillColor, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
                     break;
                 case "Arrow":
-                    $rootScope.isAnnotaionToolBarPopupClosed = false;
+                    $rootScope.isAnnotaionToolBarDrawingModeActive = false;
                     $rootScope.ArrowNumber = $rootScope.ObjectIndex++;
 
                     $rootScope.ArrowFn('#canvas', $rootScope.ArrowNumber, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
@@ -1302,14 +1302,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     //        $scope.resetRect += 1;
                     break;
                 case "Pin":
-                    $rootScope.isAnnotaionToolBarPopupClosed = false;
+                    $rootScope.isAnnotaionToolBarDrawingModeActive = false;
                     $rootScope.PinNumber = $rootScope.PinObjectIndex++;
                     $rootScope.PinArcNumber = $rootScope.ArcObjectIndex++;
                     $rootScope.PinFn('#canvas', $rootScope.PinNumber, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y, $rootScope.PinArcNumber);
 
                     break;
                 case "TextArea":
-                    $rootScope.isAnnotaionToolBarPopupClosed = false;
+                    $rootScope.isAnnotaionToolBarDrawingModeActive = false;
                     $rootScope.IsTextAlreadySave = false;
                     $("#text_area").val('');
                     // Draw text
@@ -1319,7 +1319,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     break;
 
                 case "DrawPolygon":
-                    //  $rootScope.isAnnotaionToolBarPopupClosed = false;
+                    //  $rootScope.isAnnotaionToolBarDrawingModeActive = false;
                     break;
 
             }
@@ -1397,7 +1397,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                           width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,
                           height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height,
                           click: function (layer) {
-                              if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                              if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                                   layer.draggable = true;
                                   $rootScope.shapeTypeText = "textAreaRect";
 
@@ -1423,7 +1423,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                               }
                           },
                           dblclick: function (layer) {
-                              if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                              if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                                   layer.draggable = true;
                                   $rootScope.isTextAreaClosedButtonActive = false;
                                   $rootScope.IsTextAlreadySave = true;
@@ -1601,7 +1601,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                               }
                           },
                           mouseout: function (layer) {
-                              if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                              if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                                   layer.draggable = true;
                                   $rootScope.canvasLayerNameCollection = [];
                                   $('#canvas').setLayer(layer.name, {
@@ -1620,7 +1620,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                               }
                           },
                           mouseover: function (layer) {
-                              if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                              if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                                   layer.draggable = true;
                                   $('#canvas').setLayer(layer.name, {
                                       handle: {
@@ -1721,7 +1721,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                           width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,
                           height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height,
                           click: function (layer) {
-                              if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                              if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                                   layer.draggable = true;
                                   $rootScope.shapeTypeText = "textAreaRect";
                                   var layerNameSplit = layer.name;
@@ -1748,7 +1748,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                               }
                           },
                           dblclick: function (layer) {
-                              if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                              if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                                   layer.draggable = true;
 
                                   $rootScope.isTextAreaClosedButtonActive = false;
@@ -1843,7 +1843,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                               }
                           },
                           mouseout: function (layer) {
-                              if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                              if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                                   layer.draggable = true;
                                   $rootScope.canvasLayerNameCollection = [];
                                   $('#canvas').setLayer(layer.name, {
@@ -1862,7 +1862,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                               }
                           },
                           mouseover: function (layer) {
-                              if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
+                              if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
                                   layer.draggable = true;
                                   $('#canvas').setLayer(layer.name, {
                                       handle: {
@@ -1898,7 +1898,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
             }
             //  alert("doclick");
             if (event != undefined) {
-                if ($rootScope.isAnnotaionToolBarPopupClosed == true) {
+                if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
 
                     $rootScope.DrawingListners_Canvas(event);