diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 960ce2b..d69c1f5 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -453,7 +453,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $("#DrawMode").addClass("annotationtoolbartab");
             $('.btnCursor').addClass('activebtncolor');
             $rootScope.switchCanvas();
-            
+            $("#annotationpaintbrushsize").removeClass("activebtncolor");
+            $("#annotationpainteraser").removeClass("activebtncolor");
+            $rootScope.isEraseToolSelected = false;
          //   $("#canvasPaint").css("display", "block");
          //   $("#canvas").css("display", "block");
 
@@ -651,6 +653,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $('.btnCursor').removeClass('activebtncolor');
             $(".btn-annotation").removeClass("activebtncolor");
             $(".btn-annotation-erase").addClass("activebtncolor");
+           
         }
 
         $rootScope.isShapeSyleOkBtnClicked = false;
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index b8f4f1f..0a59dd8 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -871,7 +871,7 @@
                                                 <input type="radio" name="filloption" id="filloption2" value="filloption2" checked style="margin-top:8px;">
 
 
-                                                <div id="editstylebackgroundcolor" class="form-group" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;">
+                                                <div id="editstylebackgroundcolor" class="form-group" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;float:left;">
                                                     <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span>
                                                     <input type="text" class="form-control outerBackgroundColor" data-control="saturation" style="display:none;" value="#0088cc">
                                                 </div>
@@ -916,7 +916,7 @@
                                     <div class="col-sm-6 setEnableDisableForEditShapeStyle">
                                         <label class="marginTop5">
                                             <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span>
-                                            <div class="form-group" id="outlineColor" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;">
+                                            <div class="form-group" id="outlineColor" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;float:left;">
 
                                                 <input type="text" class="form-control borderColorCanvasPreview" data-control="saturation" style="display:none;" value="#0088cc">
                                             </div>