diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
index ccb10f2..9d871d0 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
@@ -695,15 +695,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
             }
 
             if (selectimg === true) {
-                //$scope.imagePath = "~/../content/images/ai/thumbnails/" + value._ThumbnailImage;
-
-                //var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="OpenAdamImage($event)">'
-                //    + '<div class="thumbnail" ><a href="#">'
-                //                + '<img class="tinyImg" id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
-                //                + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
-
-                //$compile($el)($scope);
-
                 ailistviewdata.push(
                 {
                     "_id": value._id,
@@ -841,15 +832,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                 }
             }
             if (selectimg === true) {
-                //$scope.imagePath = "~/../content/images/ai/thumbnails/" + value._ThumbnailImage;
-
-                //var $el = $('<div id="' + value._id + '" ng-disabled="' + $scope.IsDisable + '"  class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="OpenAdamImage($event)">'
-                //    + '<div class="thumbnail" ><a href="#">'
-                //                + '<img class="tinyImg" id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
-                //                + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
-
-                //$compile($el)($scope);
-
                 ailistviewdata.push(
                 {
                     "_id": value._id,
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
index 2dbd34f..1261b08 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -356,7 +356,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
             $scope.selectedCIListViewData = $scope.GetCIwindowStoreData(windowviewid, 'IllustrationData');
 
             $('#grid-view').empty();
-            var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}"  title = "{{value._Title}}"  class="GridViewDataDivHeight" data-ng-click="openView($event)">'
+            var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}"  title = "{{value._Title}}"  data-ng-click="openView($event)">'
                     + '<div class="thumbnail" ><a href="#">'
                                 + '<img id="{{value._Title}}" ng-src="~/../content/images/ci/thumbnails/{{value._ThumbnailImage}}" >'//alt="{{value._Title}}" >'
                                 + '<div class="caption"><p> {{value._Title}}</p></div></a></div></div></li></ul>').appendTo('#grid-view');
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
index 10d1e09..1f9677e 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
@@ -471,6 +471,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
             }
 
             function convertfile(file) { 
+                //add extension
+                myfileName += '.json';
                 var x2js = new X2JS();
                 var curriculumobject = x2js.xml_str2json(file.target.result);
                 var isIncompatible=  $scope.checkCompatibility(curriculumobject);
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index ceb706c..345b9f7 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1328,16 +1328,19 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                 value: sliderValue,
                 range: "min",
                 orientation: "horizontal",
-                //     change: function (event, ui) {
-                //         var targetid = event.target.id;
-                //         var windviewid = targetid.split('_')[1];
-                //         var scope = angular.element(document.getElementById("daViewDA_" + windviewid)).scope();
-                //         scope.$apply(function () {
-                //             scope.onTransparencyChange(event, ui);
-                //         });
-                //     }
-                //    ,
-                stop: function (event, ui) {
+                slide: function (event, ui) {
+                    var $ua = navigator.userAgent;
+                    if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
+                        var targetid = event.target.id;
+                        var len=  (targetid).split("_").length;
+                        var windviewid = (targetid).split("_")[len-1];
+                        var scope = angular.element(document.getElementById("daViewDA_" + windviewid)).scope();
+                        scope.$apply(function () {
+                            scope.onTransparencyChange(event, ui);
+                        });
+                    }                    
+                } ,
+                change: function (event, ui) {
                     var targetid = event.target.id;
                     var len=  (targetid).split("_").length;
                     var windviewid = (targetid).split("_")[len-1];
@@ -1346,6 +1349,16 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                         scope.onTransparencyChange(event, ui);
                     });
                 }
+                //    ,
+                // stop: function (event, ui) {
+                //     var targetid = event.target.id;
+                //     var len=  (targetid).split("_").length;
+                //     var windviewid = (targetid).split("_")[len-1];
+                //     var scope = angular.element(document.getElementById("daViewDA_" + windviewid)).scope();
+                //     scope.$apply(function () {
+                //         scope.onTransparencyChange(event, ui);
+                //     });
+                // }
             })
             .slider("pips", {
                 rest: "label",
@@ -1505,75 +1518,75 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                 $("#" + $scope.jsPanelID).css("width", "100%");
                 $("#layerChangeSlider").css("pointer-events", "auto");
                 // on identity mode click
-                $("#btnZoom").removeAttr("onclick");
-                $("#btnZoom").on("touchstart", function () {
-                    if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928
-                        $(".btn-annotation").removeClass("activebtncolor");
-                    //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in.
-                    $('.com').remove();
-                    $('#bord').remove();
-                    console.log('OnZoom is called outside ');
-                    var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
-                    scope.$apply(function () {
-                        scope.enableZoom();
-                    });
-                });
+                // $("#btnZoom").removeAttr("onclick");
+                // $("#btnZoom").on("touchstart", function () {
+                //     if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928
+                //         $(".btn-annotation").removeClass("activebtncolor");
+                //     //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in.
+                //     $('.com').remove();
+                //     $('#bord').remove();
+                //     console.log('OnZoom is called outside ');
+                //     var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
+                //     scope.$apply(function () {
+                //         scope.enableZoom();
+                //     });
+                // });
                 // on transparency mode click
-                $("#btnTranparency").removeAttr("onclick");
-                $("#btnTranparency").on("touchstart", function () {
-                    console.log('OnEnableExtract is called outside ');
-                    var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
-                    scope.$apply(function () {
-                        scope.createTransparencyBox('true');
-                    });
-                });
+                // $("#btnTranparency").removeAttr("onclick");
+                // $("#btnTranparency").on("touchstart", function () {
+                //     console.log('OnEnableExtract is called outside ');
+                //     var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
+                //     scope.$apply(function () {
+                //         scope.createTransparencyBox('true');
+                //     });
+                // });
                 // on normal mode click
-                $("#btnNormalMode").removeAttr("onclick");
-                $("#btnNormalMode").on("touchstart", function () {
-                    console.log('OnEnableNormalMode is called outside ');
-                    $("#btnTranparency").removeClass("disabled");
-                    var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
-                    scope.$apply(function () {
-                        scope.enableNormalMode();
-                    });
-                });
+                // $("#btnNormalMode").removeAttr("onclick");
+                // $("#btnNormalMode").on("touchstart", function () {
+                //     console.log('OnEnableNormalMode is called outside ');
+                //     $("#btnTranparency").removeClass("disabled");
+                //     var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
+                //     scope.$apply(function () {
+                //         scope.enableNormalMode();
+                //     });
+                // });
                 // on extract mode click
-                $("#btnExtract").removeAttr("onclick");
-                $("#btnExtract").on("touchstart", function () {
-                    console.log('OnEnableExtract is called outside ');
-                    var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
-                    scope.$apply(function () {
-                        scope.enableExtract('true');
-                    });
-                });
+                // $("#btnExtract").removeAttr("onclick");
+                // $("#btnExtract").on("touchstart", function () {
+                //     console.log('OnEnableExtract is called outside ');
+                //     var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
+                //     scope.$apply(function () {
+                //         scope.enableExtract('true');
+                //     });
+                // });
                 // on highlight mode click
-                $("#btnHighLight").removeAttr("onclick");
-                $("#btnHighLight").on("touchstart", function () {
-                    console.log('OnEnableHighlight is called outside ');
-                    var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
-                    scope.$apply(function () {
-                        scope.enableHighlight();
-                    });
-                });
+                // $("#btnHighLight").removeAttr("onclick");
+                // $("#btnHighLight").on("touchstart", function () {
+                //     console.log('OnEnableHighlight is called outside ');
+                //     var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
+                //     scope.$apply(function () {
+                //         scope.enableHighlight();
+                //     });
+                // });
                 // on show/hide mode click
-                $("#btnStrutureBox").removeAttr("onclick");
-                $("#btnStrutureBox").on("touchstart", function () {
-                    console.log('OnBodySystem chnaged is called outside ');
-                    var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
-                    scope.$apply(function () {
-                        scope.enableShowHideStructureBox();
-                    });
-                });
-            }
-
-            $("#" + $scope.jsPanelID).resize(function (event) {
-                var len=  (event.currentTarget.id).split("_").length;
-                var windowviewid = (event.currentTarget.id).split("_")[len-1];
-                var CanvasDivLeftPosition=$scope.GetwindowStoreData(windowviewid,'CanvasDivLeftPosition');
-                var CanvasDivTopPosition=$scope.GetwindowStoreData(windowviewid,'CanvasDivTopPosition');
-                $('#canvasDivDA_' + windowviewid).scrollLeft(CanvasDivLeftPosition);
-                $('#canvasDivDA_' + windowviewid).scrollTop(CanvasDivTopPosition);
-            });
+                // $("#btnStrutureBox").removeAttr("onclick");
+                // $("#btnStrutureBox").on("touchstart", function () {
+                //     console.log('OnBodySystem chnaged is called outside ');
+                //     var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
+                //     scope.$apply(function () {
+                //         scope.enableShowHideStructureBox();
+                //     });
+                // });
+            }
+
+            // $("#" + $scope.jsPanelID).resize(function (event) {
+            //     var len=  (event.currentTarget.id).split("_").length;
+            //     var windowviewid = (event.currentTarget.id).split("_")[len-1];
+            //     var CanvasDivLeftPosition=$scope.GetwindowStoreData(windowviewid,'CanvasDivLeftPosition');
+            //     var CanvasDivTopPosition=$scope.GetwindowStoreData(windowviewid,'CanvasDivTopPosition');
+            //     $('#canvasDivDA_' + windowviewid).scrollLeft(CanvasDivLeftPosition);
+            //     $('#canvasDivDA_' + windowviewid).scrollTop(CanvasDivTopPosition);
+            // });
 
         })  
 
@@ -5984,8 +5997,20 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                 'border': '1px dotted #000'
             });
 
-            var currentMousePosition = $scope.getMousePos(e.pageX,e.pageY,windowviewid);
-
+             var $ua = navigator.userAgent;
+                if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
+                    if(e.type == 'touchstart' || e.type == 'touchmove' || e.type == 'touchend' || e.type == 'touchcancel'){
+                        // var touch = e.originalEvent.touches[0] || e.originalEvent.changedTouches[0];
+                         var touch = e.touches[0] || e.changedTouches[0];
+                         var currentMousePosition = $scope.getMousePos(touch.pageX,touch.pageY,windowviewid);
+                     }  
+                }
+                else
+                {
+                    var currentMousePosition = $scope.getMousePos(e.pageX,e.pageY,windowviewid);
+                }
+           
+            
             $scope.TBDrawStartX = currentMousePosition.x;
             $scope.TBDrawStartY = currentMousePosition.y;
 
@@ -6044,7 +6069,19 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
             $scope.verticalScrollPosition = canvasDiv.scrollTop;
             $scope.horizontlScrollPosition = canvasDiv.scrollLeft;
 
-            var currentMousePosition = $scope.getMousePos(e.pageX,e.pageY,windowviewid);
+            var $ua = navigator.userAgent;
+                if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
+                    if(e.type == 'touchstart' || e.type == 'touchmove' || e.type == 'touchend' || e.type == 'touchcancel'){
+                        // var touch = e.originalEvent.touches[0] || e.originalEvent.changedTouches[0];
+                         var touch = e.touches[0] || e.changedTouches[0];
+                         var currentMousePosition = $scope.getMousePos(touch.pageX,touch.pageY,windowviewid);
+                     }  
+                }
+                else
+                {
+                    var currentMousePosition = $scope.getMousePos(e.pageX,e.pageY,windowviewid);
+                }
+
             var move_x = currentMousePosition.x + $scope.horizontlScrollPosition;
             var move_y = currentMousePosition.y + $scope.verticalScrollPosition;
             var width = 0;
@@ -6131,8 +6168,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
             $scope.SetwindowStoreData(windowviewid, 'currentLayerNumber', parseInt($('#txtLayerNumberDA_' + windowviewid).val()));
 
             $('.rectangle').remove();
-
-            var currentMousePosition = $scope.getMousePos(e.pageX, e.pageY, windowviewid);
+            var $ua = navigator.userAgent;
+            if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
+                if(e.type == 'touchstart' || e.type == 'touchmove' || e.type == 'touchend' || e.type == 'touchcancel'){
+                   // var touch = e.originalEvent.touches[0] || e.originalEvent.changedTouches[0];
+                    var touch = e.touches[0] || e.changedTouches[0];
+                    var currentMousePosition = $scope.getMousePos(touch.pageX,touch.pageY,windowviewid);
+                }             
+            }
+            else
+            {
+                var currentMousePosition = $scope.getMousePos(e.pageX,e.pageY,windowviewid);
+            }
             var canavsDivScrollPos = $scope.getCanavsDivScrollPosition(windowviewid);
             var TransparencyEndX = currentMousePosition.x + canavsDivScrollPos.horizontlScrollPosition;
             var TransparencyBoxEndY = currentMousePosition.y + canavsDivScrollPos.verticalScrollPosition;
@@ -6150,7 +6197,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                 $('#btnTranparency_' + windowviewid).removeClass(' btn-primary');
                 $('#btnTranparency_' + windowviewid).addClass('btn-black');
 
-            } else {
+            }
+             else 
+             {
 
                 if (previewRectangleWidth == 0 && previewRectangleHeight == 0) {
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 8cf6a32..f8b24a6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1736,7 +1736,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
               // it watch the session on perticular time interval during idle time period
              // config set in AIA.js -: KeepaliveProvider.interval(10);
              //we will use it to recieve request from databse if user logout from admin activity 
-             console.log('ping user session');
+            // console.log('ping user session');
              $rootScope.CheckUserSession('update');
           });
        
@@ -8042,20 +8042,20 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                     $rootScope.StoreImageName(fileName);
 
                     if( $rootScope.UserImageExportData.length>0)
-                    {
+                    {                     
+                        var dataURL = canvas.toDataURL("image/jpeg");
+                        var blob = dataURItoBlob(dataURL);
+                        console.log(blob);
+                        saveAs(blob, fileName);
+                        $("#exportlogo").remove();
+                        $("#filename").val("");
+
                         var imageInfo=$rootScope.UserImageExportData[0];
 
                         AuthenticationService.UserLicenseExportImage(imageInfo)
                         .then(
                         function (result) {
 
-                            var dataURL = canvas.toDataURL("image/jpeg");
-                            var blob = dataURItoBlob(dataURL);
-                            console.log(blob);
-                            saveAs(blob, fileName);
-                            $("#exportlogo").remove();
-                            $("#filename").val("");
-
                             if ($rootScope.DaWindowData != undefined && $rootScope.DaWindowData.length > 0) {
                                 for (var i = 0; i < $rootScope.DaWindowData.length; i++) {
                                     $scope.updatedWindowListForSaveCB={
@@ -8149,6 +8149,76 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
         $(".export-image").css("display", "none");
 
     };
+    
+    $rootScope.SaveOpenImagefile = function () {
+        // select one module from multiple
+        var PanelElement=  $scope.GetPanelElement($rootScope.panelNameWithCb);
+
+        var canvasDiv = PanelElement.canvasDivElement;
+        if (canvasDiv == null || canvasDiv == undefined) return;
+        var canvasDivId = canvasDiv.id;
+        $("#" + canvasDivId).append("<img id='exportlogo' class='img-responsive'  src='content/images/adam-logo-small.png'/>");
+        html2canvas($("#" + canvasDivId), {
+            onrendered: function (canvas) {
+                var fileName = document.getElementById("filename_open").value + '.jpg';
+                if (typeof (fileName) == "undefined" || fileName == ".jpg")
+                    fileName = "Untitled.jpg"
+
+                    //store image to export
+                    $rootScope.StoreImageName(fileName);
+
+                    if( $rootScope.UserImageExportData.length>0)
+                    {      
+                        var dataURL = canvas.toDataURL("image/jpeg");
+                        // open image in new tab
+                        var html = '<title>' + document.getElementById("filename_open").value + '</title>'+
+                        '<div id="img"><img src="' + dataURL + '" id="newimg" style="margin:auto;top:0px;left:0px;right:0px;position:absolute;border:1px solid #ccc;" /></div>';
+                        var w = window.open();
+                        $(w.document.body).html(html);
+                           
+                        //save image file
+                        var blob = dataURItoBlob(dataURL);
+                        console.log(blob);
+                        saveAs(blob, fileName);
+                        $("#exportlogo").remove();
+                        $("#filename_open").val("");
+
+                        var imageInfo=$rootScope.UserImageExportData[0];
+
+                        AuthenticationService.UserLicenseExportImage(imageInfo)
+                        .then(
+                        function (result) {
+
+                            localStorage.setItem("daDataObject",JSON.stringify($scope.updatedWindowListForSaveCB) );
+                            if(result!=null && result!="ADMIN" )
+                            {
+                                var userid= $rootScope.userData.Id;
+                                // set already export image count
+                               $scope.UpdateUserExportImageData(userid,'CountExportImage',result.CountExportedImage);
+
+                               // set Image limit
+                               $scope.UpdateUserExportImageData(userid,'ExptImageLimit',result.ExptImageLimit);
+
+                               // set  is enable for export image
+                               $scope.UpdateUserExportImageData(userid,'isExportImage',result.isExportImage);
+
+
+                            }
+
+                         }),
+                        function (error) {
+                            console.log(' Error in export Image to databse = ' + error.statusText);
+                            $rootScope.errorMessage = error;
+                            $("#messageModal").modal('show');
+                        }
+
+                    }
+
+            }
+        });
+        $(".export-image-ipad").css("display", "none");
+
+    };
 
 }]
 )
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index b20c152..61bedd4 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -893,14 +893,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             value: zoomLevel,
             range: "min",
             orientation: "vertical",
-            // slide: function (event, ui) {
-            //     if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
-            //         var targetid = event.target.id;
-            //         var len=  (targetid).split("_").length;
-            //         var windviewid = (targetid).split("_")[len-1];
-            //         changeThumbnailSize(event, ui.value, windviewid);
-            //     }
-            // } ,
+            slide: function (event, ui) {
+                // work on touch screen device
+                var $ua = navigator.userAgent;
+                if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
+                    var targetid = event.target.id;
+                    var len=  (targetid).split("_").length;
+                    var windviewid = (targetid).split("_")[len-1];
+                    changeThumbnailSize(event, ui.value, windviewid);
+                }              
+            } ,
             change: function (event, ui) {
                 var targetid = event.target.id;
                 var len=  (targetid).split("_").length;
@@ -3310,38 +3312,38 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             $("#ImagePanel").css("width", "100%");
 
             //hide pin button clicked
-            $("#hidePinBtn").removeAttr("onclick");
-            $("#hidePinBtn").on("touchstart", function () {
-                var rootScope = angular.element(document.getElementById("aaBodyView")).scope();
-                rootScope.$apply(function () {
-                    rootScope.hidePins(event);
-                });
-            });
+            // $("#hidePinBtn").removeAttr("onclick");
+            // $("#hidePinBtn").on("touchstart", function () {
+            //     var rootScope = angular.element(document.getElementById("aaBodyView")).scope();
+            //     rootScope.$apply(function () {
+            //         rootScope.hidePins(event);
+            //     });
+            // });
             //selected pin button clicked
-            $("#selectedPin").removeAttr("onclick");
-            $("#selectedPin").on("touchstart", function () {
-                console.log('showSelectedPins is called')
-                var scope = angular.element(document.getElementById("aaBodyView")).scope();
-                scope.$apply(function () {
-                    scope.showSelectedPins(event);
-                });
-            });
-            //all pin button clicked
-            $("#allPinBtn").removeAttr("onclick");
-            $("#allPinBtn").on("touchstart", function () {
-                var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
-                scope.$apply(function () {
-                    scope.showAllPinsAfterHide(event);
-                });
-            });
-            //comment-box button clicked
-            $("#comment-box").removeAttr("onclick");
-            $("#comment-box").on("touchstart", function () {
-                var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
-                scope.$apply(function () {
-                    scope.ShowHideAnnotation(event);
-                });
-            });
+            // $("#selectedPin").removeAttr("onclick");
+            // $("#selectedPin").on("touchstart", function () {
+            //     console.log('showSelectedPins is called')
+            //     var scope = angular.element(document.getElementById("aaBodyView")).scope();
+            //     scope.$apply(function () {
+            //         scope.showSelectedPins(event);
+            //     });
+            // });
+            // //all pin button clicked
+            // $("#allPinBtn").removeAttr("onclick");
+            // $("#allPinBtn").on("touchstart", function () {
+            //     var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
+            //     scope.$apply(function () {
+            //         scope.showAllPinsAfterHide(event);
+            //     });
+            // });
+            // //comment-box button clicked
+            // $("#comment-box").removeAttr("onclick");
+            // $("#comment-box").on("touchstart", function () {
+            //     var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
+            //     scope.$apply(function () {
+            //         scope.ShowHideAnnotation(event);
+            //     });
+            // });
 
         }
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
index fd734c6..699876d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
@@ -75,7 +75,7 @@
                 }
             })
             .success(function (data, status, headers, config) {
-                console.log('success')
+                //console.log('success')
                 deferred.resolve(data);
             }).error(function (data, status, headers, config) {
                 console.log('error')
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
index decca36..66c398e 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
@@ -49,7 +49,7 @@
         <li class="navbarItem"><a ng-click="reDirectURLToAdmin()" ng-show="haveRoleAdmin" style="cursor: pointer;">Admin</a></li>
     </ul>
     <ul class="nav navbar-nav navbar-right">
-        <li class="navbarItem" style="pointer-events:none ;"><a href="#">{{userName}}</a></li>
+        <li id="userNameoption" class="navbarItem" style="pointer-events:none ;"><a href="#">{{userName}}</a></li>
         <li class="hidden-xs marginR5 logOut" data-toggle="tooltip" data-placement="top" title="Logout"><a href="" ng-click="LogoutUser()"><i class="fa fa-power-off"></i></a></li>
     </ul>
     <div id="imaginary_container" style="visibility:hidden">
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.aspx b/400-SOURCECODE/AIAHTML5.Web/index.aspx
index 7f98785..9dac133 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.aspx
+++ b/400-SOURCECODE/AIAHTML5.Web/index.aspx
@@ -625,7 +625,7 @@
                 <div class="annotationbar">
                     <div class="modal-content">
                         <div class="modal-header annotation-modal-header">
-                            <button type="button" class="close" aria-label="Close" ng-click="CloseAnnotationTool()"><span aria-hidden="true">&times;</span></button>
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close" ng-click="CloseAnnotationTool()"><span aria-hidden="true">&times;</span></button>
                             <h4 class="modal-title" id="myModalLabel">Annotation</h4>
                         </div>
                         <div class="modal-body" id="AnnotaionPopupDiv">
@@ -1200,7 +1200,7 @@
                                     <div class="form-group">
                                         <label for="filename">Filename:</label>
                                         <div class="input-group">
-                                            <input type="text" class="form-control" id="filename" placeholder="" ng-model="filename">
+                                            <input type="text" class="form-control" id="filename" placeholder="enter name" ng-model="filename">
                                             <div class="input-group-addon">.jpg</div>
                                         </div>
                                     </div>
@@ -1211,7 +1211,7 @@
                         <div class="modal-footer">
                             <div class="row">
                                 <input type="file" id="file1" style="display:none">
-                                <div class="col-sm-12"><button id="btnSaveEI" ng-click="SaveImagefile()" class="btn btn-primary" data-dismiss="modal" type="button">Ok</button></div> <!--onclick="makeScreenshot();"--><!--ng-click="dialogs.saveAs()"--><!--ng-click="ShowAlert()"-->
+                                <div class="col-sm-12"><button id="btnSaveEI" ng-click="SaveImagefile()" class="btn btn-primary" data-dismiss="modal" type="button">Ok</button></div>
                             </div>
                         </div>
 
@@ -1220,18 +1220,18 @@
             </div>
             <div class="modal fade export-image-ipad ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
                  style="z-index: 1200002;">
-                <div class="modal-dialog modal-sm" role="document">
+                <div class="modal-dialog modal-sm" role="document" style="width:400px">
                     <div class="modal-content">
                         <div class="modal-header annotation-modal-header ui-draggable-handle">
                             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
                             <h4 class="modal-title" id="">Download Export Image</h4>
                         </div>
-                        <div class="modal-body">
+                        <div class="modal-body" style="width: 400px; height: 100px; overflow-x: auto;">
                             <div class="row paddTopbtm15">
                                 <div class="col-sm-12">
                                     <div class="form-group">
-                                        <label for="filename">Exported image open in next Teb. Please download it</label>
-
+                                        <label for="filename">Exported image open in new Teb. Please download it</label>
+                                        <input type="text" class="form-control" id="filename_open" placeholder="enter name" ng-model="filename_open">
                                     </div>
                                 </div>
                             </div>
@@ -1240,8 +1240,8 @@
                         <div class="modal-footer">
                             <div class="row">
                                 <input type="file" id="file1" style="display:none">
-                                <!--<a href="data:application/xml;charset=utf-8,your code here" download="filename.html">Save</a-->
-                                <div class="col-sm-12"><button id="btnPrintPreview" class="btn btn-primary" data-dismiss="modal" type="button">Ok</button></div> <!--onclick="makeScreenshot();"--><!--ng-click="dialogs.saveAs()"--><!--ng-click="ShowAlert()"-->
+                                <!-- <div class="col-sm-12"><button id="btnPrintPreview" class="btn btn-primary" data-dismiss="modal" type="button">Ok</button></div> -->
+                                <div class="col-sm-12"><button ng-click="SaveOpenImagefile()" class="btn btn-primary" data-dismiss="modal" type="button">Ok</button></div>
                             </div>
                         </div>
 
@@ -1383,7 +1383,7 @@
             <div class="modal-content">
                 <div class="modal-header ui-draggable-handle " style="background-color: #ec6798; border-color: #007ab3;cursor:default; padding:5px">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="font-size: 30px;"><span aria-hidden="true">&times;</span></button>
-                    <h4 style="color:#fff; float: left;">AIA Message</h4>
+                    <h4 style="color:#fff; float: left;">Alert!</h4>
                 </div>
                 <div class="modal-body" style=" height: 160px; overflow-x: auto;">
                     <div class="panel-body">
@@ -1406,7 +1406,7 @@
             <div class="modal-content">
                 <div class="modal-header ui-draggable-handle " style="background-color: #ec6798; border-color: #007ab3;cursor:default; padding:5px">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="font-size: 30px;"><span aria-hidden="true">&times;</span></button>
-                    <h4 style="color:#fff; float: left;">AIA Message</h4>
+                    <h4 style="color:#fff; float: left;">Alert!</h4>
                 </div>
                 <div class="modal-body" style=" height: 160px; overflow-x: auto;">
                     <div class="panel-body">
@@ -2111,21 +2111,21 @@
     <!-- Export Image Save Click-->
     <script>
         $(function () {
-            $("#btnPrintPreview").click(function () {
-                $("#canvasDiv").append("<img id='exportlogo' class='img-responsive'  src='content/images/adam-logo-small.png'/>");
-                html2canvas($("#canvasDiv"), {
-                    onrendered: function (canvas) {
-                        var imgsrc = canvas.toDataURL("image/png");
-                        console.log(imgsrc);
-                        var html = '<div id="img"><img src="' + imgsrc + '" id="newimg" style="margin:auto;top:0px;left:0px;right:0px;position:absolute;border:1px solid #ccc;" /></div>';
-                        var w = window.open();
-                        $(w.document.body).html(html);
-                        $("#filename").val("");
-                        $("#exportlogo").remove();
-                    }
-                });
-
-            });
+            // $("#btnPrintPreview").click(function () {
+            //     $("#canvasDiv").append("<img id='exportlogo' class='img-responsive'  src='content/images/adam-logo-small.png'/>");
+            //     html2canvas($("#canvasDiv"), {
+            //         onrendered: function (canvas) {
+            //             var imgsrc = canvas.toDataURL("image/png");
+            //             console.log(imgsrc);
+            //             var html = '<div id="img"><img src="' + imgsrc + '" id="newimg" style="margin:auto;top:0px;left:0px;right:0px;position:absolute;border:1px solid #ccc;" /></div>';
+            //             var w = window.open();
+            //             $(w.document.body).html(html);
+            //             $("#filename").val("");
+            //             $("#exportlogo").remove();
+            //         }
+            //     });
+
+            // });
 
         });
         function dataURItoBlob(dataURI) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/bootstrap.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/bootstrap.css
index 28ff0b1..d3f542c 100644
--- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/bootstrap.css
+++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/bootstrap.css
@@ -6046,3 +6046,14 @@ button.close {
     display: none !important;
   }
 }
+/* update css for top menu for devices */
+@media (min-width: 480px) and (max-width: 900px) {
+  #userNameoption {
+    display: none !important;
+  }
+}
+@media (min-width: 901px) {
+  #userNameoption {
+    display: block !important;
+  }
+}