diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index 85fa59e..90b167c 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -399,9 +399,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                         $scope.allPinDataArray.push(value._PinId);
                         $scope.drawStaticPinsOnImage('aaDetailViewCanvas', value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY)
                     })
-
-
-
                     //load search/vocab data
                     $rootScope.loadSearchData();
                 }
@@ -1435,6 +1432,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $(".tooltip-custom").removeClass("btn-primary");
         $(".tooltip-custom").addClass("btn-black");
         $("#hidePinBtn").addClass("btn-primary");
+        $("#hidePinBtn").removeClass("btn-black");
     }
 
     $scope.showAllPinsAfterHide = function (event) {
@@ -1457,6 +1455,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $(".tooltip-custom").removeClass("btn-primary");
         $(".tooltip-custom").addClass("btn-black");
         $("#allPinBtn").addClass("btn-primary");
+        $("#allPinBtn").removeClass("btn-black");
         if ($scope.isSliderChange == true) {
             $scope.isSliderChange = false;
             $scope.showAllPins();
@@ -1486,6 +1485,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $(".tooltip-custom").removeClass("btn-primary");
         $(".tooltip-custom").addClass("btn-black");
         $("#selectedPin").addClass("btn-primary");
+        $("#selectedPin").removeClass("btn-black");
        
         if ($scope.isSelectedPinBtnClickedAftrSliderCange == true) {
           
@@ -1659,6 +1659,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 var speechBubbleLineDispProp = $("#speechBubbleLine" + sppechBubbleId).css("display");
                 var speechBubbleLineID = "speechBubbleLine" + sppechBubbleId;
                 var speechBubbleDraggedLineID = "speechBubbleDraggedLine" + sppechBubbleId;
+                $("#comment-box").addClass("btn-primary");
+                $("#comment-box").removeClass("btn-black");
+
                 if (speechBubbleLineDispProp == "block") {
                     $rootScope.annotationArray.push({ "speechBuubleId": speechBubbleID, "speechBubbleLineId": speechBubbleLineID });
                 }
@@ -1671,6 +1674,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 $("#" + $rootScope.annotationArray[i].speechBuubleId).css("display", "none");
                 $("#" + $rootScope.annotationArray[i].speechBubbleLineId).css("display", "none");
             }
+        
         }
         else {
             $rootScope.isShowHideButtonClicked = true;
@@ -1678,7 +1682,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 $("#" + $rootScope.annotationArray[i].speechBuubleId).css("display", "block");
                 $("#" + $rootScope.annotationArray[i].speechBubbleLineId).css("display", "block");
             }
+
+            $("#comment-box").removeClass("btn-primary");
+            $("#comment-box").addClass("btn-black");
+ 
         }
+        
     }
     $scope.activePinOnLayerChange = function () {