diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 1633c98..59612c9 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -48,6 +48,22 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         $rootScope.menuLabExer;
         $rootScope.menuLabExer = 0;
 
+
+        $rootScope.fontSizes;
+        $rootScope.fontWeight;
+        $rootScope.fontStyle;
+        $rootScope.textAlignmt;
+        $rootScope.fontColor;
+        $rootScope.underlineText;
+        $rootScope.textArea;
+        $rootScope.fontFamily;
+        $rootScope.TextPropertyArray = [];
+        $rootScope.modifySavedText = [];
+        $rootScope.TextRectangleArr = [];
+        $rootScope.rectDimension = [];
+
+
+
         $rootScope.$on("$locationChangeSuccess", function () {
 
             if (($location.url() == "/da-body-view") || ($location.url() == "/clinical-illustrations-detail") || ($location.url() == "/clinical-animations-detail")) {
@@ -950,8 +966,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
 
                     var RectNameArray = (layer.name).split("_");
 
-                    var TextAreaRectName1 = "TextArea_";
-                    var TextAreaRectNameConcat = TextAreaRectName1.concat(RectNameArray[1]);
+                    var TextAreaRectangleName = "TextArea_";
+                    var TextAreaRectNameConcat = TextAreaRectangleName.concat(RectNameArray[1]);
                     $rootScope.TextAreaRectID = layer.name;
                     $rootScope.TextID = TextAreaRectNameConcat;
 
@@ -1071,8 +1087,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         $rootScope.PinNumber = 0;
         $rootScope.PinArcNumber = 0;
         $rootScope.ObjectIndex = 0;
-        $rootScope.Object1Index = 0;
-        $rootScope.Object2Index = 0;
+        $rootScope.ArcObjectIndex = 0;
+        $rootScope.PinObjectIndex = 0;
         $rootScope.TextNumber = 0;
         $rootScope.resetTextSave = 0;
         $rootScope.ObjectIndexSave = 0;
@@ -1137,8 +1153,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     //        $scope.resetRect += 1;
                     break;
                 case "Pin":
-                    $rootScope.PinNumber = $rootScope.Object2Index++;
-                    $rootScope.PinArcNumber = $rootScope.Object1Index++;
+                    $rootScope.PinNumber = $rootScope.PinObjectIndex++;
+                    $rootScope.PinArcNumber = $rootScope.ArcObjectIndex++;
                     $rootScope.PinFn('#canvas', $rootScope.PinNumber, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y, $rootScope.PinArcNumber);
 
                     break;
@@ -1161,18 +1177,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         }
 
 
-        $rootScope.fontSizes;
-        $rootScope.fontWeight;
-        $rootScope.fontStyle;
-        $rootScope.textAlignmt;
-        $rootScope.fontColor;
-        $rootScope.underlineText;
-        $rootScope.textArea;
-        $rootScope.fontFamily;
-        $rootScope.TextPropertyArray = [];
-        $rootScope.modifySavedText = [];
-        $rootScope.TextRectangleArr = [];
-        $rootScope.rectDimension = [];
+