diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index cba3b58..c9c5adc 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -965,7 +965,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     }
 
     $rootScope.switchToTransparencycanvas = function () {
-
+    
         if ($rootScope.isTBoxModestyVisible == true) {
             var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
             if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
@@ -984,13 +984,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                             $("#canvas").css("z-index", MaxZindexVal);
                             if ($rootScope.currentBodyViewId == "11") {
                                 $(".ui-wrapper").css("z-index", MaxZindexVal + 1);
-                                $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+                               $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
 
                             }
-                            else
+                            else {
                                 $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
-
-
+                            }
                         }
                         else {
                             var drawCanvasZindex = $("#canvas").css("z-index");
@@ -1000,11 +999,19 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                             MaxZindexVal = parseInt(MaxZindexVal + 1);
 
                             if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
-
                                 $("#canvasPaint").css("z-index", MaxZindexVal);
                             }
                             else {
+                               
                                 $("#canvas").css("z-index", MaxZindexVal);
+                                if ($rootScope.currentBodyViewId == "11") {
+                                     $(".ui-wrapper").css("z-index", MaxZindexVal);
+                                }
+                                else
+                                {
+                                    $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+                                }
+                             
                             }
 
                         }
@@ -1417,7 +1424,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
 
 
     $rootScope.switchCanvas = function () {
-        debugger;
+      
         if ($rootScope.isTBoxModestyVisible == true) {
             var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
             if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
@@ -1442,11 +1449,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                         else {
 
                             if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
-
-                                $("#canvasPaint").css("z-index", MaxZindexVal);
+                                if ($rootScope.currentBodyViewId == "11") { $("#canvasPaint").css("z-index", MaxZindexVal + 1); }
+                                else{ $("#canvasPaint").css("z-index", MaxZindexVal);}
                             }
                             else {
-                                $("#canvas").css("z-index", MaxZindexVal);
+                                if ($rootScope.currentBodyViewId == "11") {
+                                    $("#canvas").css("z-index", MaxZindexVal + 1);
+                                }
+                                else
+                                {
+                                    $("#canvas").css("z-index", MaxZindexVal);
+                                }
                             }
 
                         }