diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index b93d510..6356946 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -140,6 +140,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
     }
 
+
     $scope.scroll = function () {
         // $window.scrollTo(0, 0);
         $("html,body").scrollTop(0);
@@ -3569,6 +3570,41 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
         }
 
+
+        if (document.getElementById("btnStrutureBox").name == "showAnnotationStructure") {
+            $scope.showAnnotation()
+           
+        }
+        else {
+            $scope.hideAnnotation()
+          
+
+        }
+    }
+
+    $scope.showAnnotation = function()
+    {
+        $(".com").show();
+        $('#dot').show();
+        $('#bord').show();
+        $('#sppeachBubble').show();
+        $('#sppeachBubble_annotation').show();
+
+        $("#bord_annotation").show();
+        $("#dot_annotation").show();
+        $(".dynCross_anno").parent().parent().parent().show();
+    }
+
+    $scope.hideAnnotation=function()
+    {
+        $(".com").hide();
+        $('#dot').hide();
+        $('#bord').hide();
+        $('#sppeachBubble').hide();
+        $('#sppeachBubble_annotation').hide();
+        $("#bord_annotation").hide();
+        $("#dot_annotation").hide();
+        $(".dynCross_anno").parent().parent().parent().hide();
     }
 
     $scope.createSpeechBubbleBasedOnAnnotationLength = function (pointClicked, x, y, id) {
@@ -5878,19 +5914,34 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
 
         //if listanager is visisble then close it
+      
 
         $rootScope.isListManagerSelected = false;
         $rootScope.CloseListManager();
+        var btnStrutureBoxname = document.getElementById("btnStrutureBox").name;
+
+        if (btnStrutureBoxname == "showAnnotationStructure") {
+            $("#btnStrutureBox").addClass("disableHideShowStructure");
+            $scope.hideAnnotation();
+            document.getElementById("btnStrutureBox").name = "hideAnnotationStructure";
+        }
+        else {
+            $("#btnStrutureBox").removeClass("disableHideShowStructure");
+            $scope.showAnnotation();
+
+            document.getElementById("btnStrutureBox").name = "showAnnotationStructure";
+        }
+        //$(".com").toggle();
+        //$('#dot').toggle();
+        //$('#bord').toggle();
+        //$('#sppeachBubble').toggle();
+        //$('#sppeachBubble_annotation').toggle();
+
+        //$("#bord_annotation").toggle();
+        //$("#dot_annotation").toggle();
+        //$(".dynCross_anno").parent().parent().parent().toggle();
 
-        $(".com").toggle();
-        $('#dot').toggle();
-        $('#bord').toggle();
-        $('#sppeachBubble').toggle();
-        $('#sppeachBubble_annotation').toggle();
 
-        $("#bord_annotation").toggle();
-        $("#dot_annotation").toggle();
-        $(".dynCross_anno").parent().parent().parent().toggle();
 
     }
 
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 5934b62..aebc00b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -238,7 +238,7 @@
             </div>
 
             <div class="col-xs-12">
-                <button id="btnStrutureBox" onclick="enableShowHideStructureBox()" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Show/Hide Structure Name Boxes"> <img src="content/images/comment-box.png" alt=""></button>
+                <button id="btnStrutureBox" onclick="enableShowHideStructureBox()" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom" data-toggle="tooltip" data-placement="bottom" name="showAnnotationStructure" title="Show/Hide Structure Name Boxes"> <img src="content/images/comment-box.png" alt=""></button>
             </div>
 
             </div>
diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
index 72a4935..764f45c 100644
--- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
+++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -933,4 +933,10 @@ background-size:cover;
 /*Bug #8679*/
     .selected {
         background-color: lightgrey;
-    }
\ No newline at end of file
+    }
+
+    .disableHideShowStructure
+     {
+       background:#4b4b4b !important;
+       border-color:#3f3f3f !important;
+     }
\ No newline at end of file