diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
index 62328af..a1019e2 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
@@ -113,7 +113,11 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
             var opcity = $("#HomeContainerDiv").css("opacity")
 
             if (opcity != 1 && $scope.SectionContentForExportCB.length<=0) {
-                $scope.CBEnableUI();
+                if($rootScope.loadingAnimationstatus==undefined || $rootScope.loadingAnimationstatus==0)
+                {
+                    $scope.CBEnableUI();
+                }
+              
             }
         }, 40000);
 
@@ -1706,9 +1710,11 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
     }
 
     $scope.saveCBwithAnimation=function(downloadtype,filename)
-    {
+    {       
         if($rootScope.collectAnimationSource.length>0)
         {
+            $rootScope.loadingAnimationstatus=1;
+            $("#saveAsCurriculum").modal('hide'); 
             var AnimationData=[];  
             function getBase64Image(base64string) {
                 return base64string.replace(/^data:video\/(mp4);base64,/, "");
@@ -1741,7 +1747,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
               },            
               function (error) {
                 console.log(' Error in Saving video = ' + error.statusText);
-                $scope.CBEnableUI();                
+                $scope.CBEnableUI();      
+                $rootScope.loadingAnimationstatus=0;          
                 $scope.SectionContentForExportCB=[]; 
                 $rootScope.dynamicUpdatedJsonForExportCB = "";
                 $rootScope.dynamicUpdatedJsonForSaveCB = "";
@@ -1753,7 +1760,9 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
             function(progress){
                 $('#uploading-curriculum').css("display", "block");             
                 //console.log('uploading: ' + Math.floor(progress) + '%');
-                $rootScope.loadingstatus= + Math.floor(progress) + '%';               
+                $rootScope.loadingstatus= + Math.floor(progress) + '%'; 
+                $rootScope.loadingAnimationstatus=1;
+
                }
             )           
         }
@@ -1790,6 +1799,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
             saveAs(blob, filename);
                        
         // }
+        $rootScope.loadingAnimationstatus=0;
         $scope.SectionContentForExportCB=[];
         $rootScope.dynamicUpdatedJsonForExportCB = "";
         $rootScope.dynamicUpdatedJsonForSaveCB = "";
@@ -1797,7 +1807,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
         $('#uploading-curriculum').css("display", "none");
         $scope.CBEnableUI(); 
         $("#saveAsCurriculum").modal('hide'); 
-          
          //disable tiny editor while section active
          if($scope.nodeTypeIsBranch=="true")
          {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 2bebb72..c8d38ad 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -5447,7 +5447,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                 $("#annotationTextModal").css("padding-right", "0px");
                 $("#annotationTextModal").modal("toggle");
                 document.getElementById('modelbackground').style.display = "block";
-
+                $("#annotationTextModal").draggable('disable');
+               
                 $scope.resetTextarea(shapestyle.fillStyle);                            
             }
             else
@@ -5487,6 +5488,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
         $(".btn-annotation").removeClass("activebtncolor");
 
         $('.btnCursor').addClass('activebtncolor');
+        $('#text_area').focus();
 
     }
 
@@ -5630,7 +5632,9 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
         $("#annotationTextModal").css("padding-right", "0px");
         document.getElementById('modelbackground').style.display = "block";
         $("#annotationTextModal").modal("toggle");
-
+        $("#annotationTextModal").draggable('disable');
+        $('#text_area').focus();
+        
     }
 
     $rootScope.TextEditorDrawText=function(canvasId,selectedTextRect,selectedTextArea,areaText)
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.aspx b/400-SOURCECODE/AIAHTML5.Web/index.aspx
index e0af5e7..023e058 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.aspx
+++ b/400-SOURCECODE/AIAHTML5.Web/index.aspx
@@ -724,7 +724,7 @@
             </div>
 
             <!--Modal For Annotation Text Box-->
-            <div id="annotationTextModal" style="display:none;z-index: 1000000000;width:500px;height:241px;padding-right:0!important;position:fixed;left:0;right:0;top:0px;bottom:0;margin:auto;">
+            <div id="annotationTextModal" style="display:none;z-index: 1000000000;width:500px;height:241px;padding-right:0!important;position:fixed;left:20%;top:100px;margin:auto;">
 
                 <div class="modal-content">
                     <div class="modal-header" style="background-color: #808D43;padding:10px;border-bottom:0;">
@@ -1686,6 +1686,7 @@
             $(".modeleditstyle").draggable({containment:'window'});
             $("#annotationTextModal").draggable({ containment: 'window' });
             $("#modal-settings").draggable({ containment: 'window' });
+            
         });
     </script>
 
@@ -2140,11 +2141,11 @@
             });
 
 
-            $("#selected-font-family, #selected-font-size").click(function () {
-                $("#annotationTextModal").draggable('disable');
-            }).blur(function () {
-                $("#annotationTextModal").draggable('enable');
-            });
+            // $("#selected-font-family, #selected-font-size").click(function () {
+            //     $("#annotationTextModal").draggable('disable');
+            // }).blur(function () {
+            //     $("#annotationTextModal").draggable('enable');
+            // });
             $("#lexiconLangDropdown").click(function () {
                 $("#modal-settings").draggable('disable');
             }).blur(function () {
diff --git a/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js b/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js
index f4b2b6f..6a6d6b9 100644
--- a/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js
+++ b/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js
@@ -1,7 +1,7 @@
 previousGrayImageDataList = [];
 
 getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, coloredImageData, grayImageData, bodyRegionId, canvasId) {
-    console.log('for bodyRegionId in worker process: ' + bodyRegionId + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"))
+    //console.log('for bodyRegionId in worker process: ' + bodyRegionId + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"))
 
     var masklen = maskCanvasData.data.length;
     var maskData = maskCanvasData.data;