diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 8f759bf..7c2d8a6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -70,7 +70,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.shapestyleFillBorderColor = "black";
     $rootScope.shapestyleborderWidth = 2;
     $rootScope.shapestyleborderStyles = "solid";
-
+    $rootScope.errorMassage = '';
 
     $rootScope.userInfo = {
         username: null,
@@ -98,8 +98,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.AuthenticateUser = function (userInfo) {
         if (userInfo.username == "" || userInfo.username == null || userInfo.password == "" || userInfo.password == null) {
 
-            alert(LoginMessageConstants.USER_CREDENTIALS_MISSING);
-           
+           // alert(LoginMessageConstants.USER_CREDENTIALS_MISSING);
+            $rootScope.errorMassage = LoginMessageConstants.USER_CREDENTIALS_MISSING;
+            $("#messageModal").modal('show');
         }
         else {
 
@@ -115,12 +116,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                  {
                  if (result == LoginConstants.USER_NOT_FOUND) {
                      $rootScope.isVisibleLogin = true;
-                     alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT);
+                    // alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT);
+                     $rootScope.errorMassage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT;
+                     $("#messageModal").modal('show');
 
                  }
                  else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) {
-                     alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
+                     //alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
                      $rootScope.isVisibleLogin = true;
+                     $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
+                     $("#messageModal").modal('show');
                  }
                  else {
                      if (result.loginId != undefined || result.loginId != "" || result.loginId != null) {
@@ -136,8 +141,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
              },
              function (error) {
                  console.log(' Error in authentication = ' + error.statusText);
-                 alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
+                // alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
                  $rootScope.isVisibleLogin = true;
+                 $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
+                 $("#messageModal").modal('show');
              });
         }
 
@@ -194,13 +201,19 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 AuthenticationService.SendMailToUser(userInfo)
                 .then(function (result) {
                     if (result == LoginConstants.USER_NOT_FOUND) {
-                        alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT);
+                      //  alert(LoginMessageConstants.INCORRECT_EMAIL_ID);
+                        $rootScope.errorMassage = LoginMessageConstants.INCORRECT_EMAIL_ID;
+                        $("#messageModal").modal('show');
                     }
                     else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) {
-                        alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
+                      //  alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
+                        $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
+                        $("#messageModal").modal('show');
                     }
                     else if (result == LoginConstants.MAIL_NOT_SENT) {
-                        alert(LoginMessageConstants.MAIL_NOT_SENT);
+                       // alert(LoginMessageConstants.MAIL_NOT_SENT);
+                        $rootScope.errorMassage = LoginMessageConstants.MAIL_NOT_SENT;
+                        $("#messageModal").modal('show');
                     }
                     else {
                         if (result.loginId != undefined || result.loginId != "" || result.loginId != null) {
@@ -217,8 +230,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                                 message = LoginMessageConstants.RESET_PASSWORD;
                             else
                                 message = LoginMessageConstants.USERID_SENT_IN_EMAIL
-                                alert(message);
-                            
+                                //alert(message);
+                                $rootScope.errorMassage = message;
+                                $("#messageModal").modal('show');
+
                           
                         }
                     }
@@ -226,15 +241,22 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 },
                 function (error) {
                     console.log(' Error in authentication = ' + error.statusText);
-                    alert(LoginConstants.ERROR_IN_FECTHING_DETAILS);
+                   // alert(LoginConstants.ERROR_IN_FECTHING_DETAILS);
+                    $rootScope.errorMassage = LoginConstants.ERROR_IN_FECTHING_DETAILS;
+                    $("#messageModal").modal('show');
                 });
             }
             else {
-                alert(LoginMessageConstants.INCORRECT_EMAIL_ID);
+               // alert(LoginMessageConstants.INCORRECT_EMAIL_ID);
+                $rootScope.errorMassage = LoginMessageConstants.INCORRECT_EMAIL_ID;
+                $("#messageModal").modal('show');
             }
         }
         else {
-            alert(LoginMessageConstants.BLANK_EMAIL_ID);
+            //alert(LoginMessageConstants.BLANK_EMAIL_ID);
+            $rootScope.errorMassage = LoginMessageConstants.BLANK_EMAIL_ID;
+            $("#messageModal").modal('show');
+
         }
     };
 
@@ -266,14 +288,22 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             .then(
                  function (result) {
                      if (result == LoginConstants.USER_NOT_FOUND) {
-                         alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT);
+                       //  alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT);
+                         $rootScope.errorMassage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT;
+                         $("#messageModal").modal('show');
+
                      }
                      else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) {
-                         alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
+                        // alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
+                         $rootScope.errorMassage = LoginConstants.ERROR_IN_FECTHING_DETAILS;
+                         $("#messageModal").modal('show');
+
                      }
                      else {
                          if ((result.IsAcknowledged == true) && (result.IsModifiedCountAvailable == true)) {
-                             alert(LoginMessageConstants.PASSWORD_RESET_MESSAGE);
+                            // alert(LoginMessageConstants.PASSWORD_RESET_MESSAGE);
+                             $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
+                     $("#messageModal").modal('show');
                              $rootScope.isVisibleLogin = true;
                              $rootScope.isVisibleResetPass = false;
                              $location.url("/") ;
@@ -282,11 +312,15 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                  },
                  function (error) {
                      console.log(' Error in authentication = ' + error.statusText);
-                     alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
+                   //  alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
+                     $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
+                     $("#messageModal").modal('show');
+
                  });
         }
         else {
             $rootScope.errorMesaage = LoginMessageConstants.NEW_AND_OLD_PASSWORD_DONOT_MATCH;
+            $("#messageModal").modal('show');
         }
     }
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
index 8432934..496a699 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -293,11 +293,14 @@ AIA.constant("LoginMessageConstants", {
     "USERID_SENT_IN_EMAIL": "Please check you email, sent UserId in your email.",
     "ERROR_IN_FECTHING_DETAILS": "Error in fecthing details.",
     "MAIL_NOT_SENT": "We are facing some issue in sending email. Please try after sometime.",
-    "INCORRECT_EMAIL_ID": "Please enter correct email id",
-    "BLANK_EMAIL_ID": "Please enter your email id",
+    "INCORRECT_EMAIL_ID": "Please enter correct email id.",
+    "BLANK_EMAIL_ID": "Please enter your email id.",
     "PASSWORD_RESET_MESSAGE": "Your password has been reset.",
     "NEW_AND_OLD_PASSWORD_DONOT_MATCH": "Your new password and confirm password not matched!",
-    "USER_CREDENTIALS_MISSING":"Please Enter your credentials"
+    "USER_CREDENTIALS_MISSING": "Please Enter your credentials.",
+    "USER_NOT_FOUND": "User not found.",
+    //"ERROR_IN_FECTHING_DETAILS": "Error in fecthing details.",
+    //"MAIL_NOT_SENT": "Mail not sent."
 
 })
 AIA.constant("UserModules", [
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 5f4b719..8b56ede 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -1144,129 +1144,20 @@
             </tbody>
         </table>
     </div>
-    <!--<div class="modal fade" id="editshapestyle" tabindex="-1" role="dialog" aria-labelledby="myModalLabel33" style="z-index:1000000000;width:302px;margin-left:auto;margin-right:auto;overflow:hidden;height:460px;">
-        <div class="modal-dialog modal-sm" role="document">
-            <div class="modal-content">
-                <div class="modal-header annotation-modal-header">
-                    <h4 class="modal-title" id="myModalLabel33">Edit Shape Style</h4>
-                </div>
-                <div class="modal-body">
-                    <div class="marginTopBtm10">
-                        <div class="well well-sm no-margin-btm">
-                            <div class="row">
-                                <div class="col-sm-12">
-                                    <div class="checkbox no-margin">
-                                        <label>
-                                            <input id="fill-option" type="checkbox" checked onclick="enableDisableFillOption()"> Fill Option
-                                        </label>
-                                    </div>
-                                </div>
-                                <div class="col-sm-6 enableDisableOpacity">
-                                    <div class="radio">
-                                        <label>
-                                            <input type="radio" name="filloption" id="filloption1" value="filloption1">
-                                            <span class="">Texture</span>
-                                            <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern">
-                                        </label>
-                                    </div>
-                                    <div class="radio">
-                                        <label>
-                                            <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;">
-                                                <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>
-
-
-
-                                        </label>
-                                    </div>
-                                </div>
-                                <div class="col-sm-6 no-padding marginTop10 enableDisableOpacity">
-                                    <div class="row">
-                                        <label class="pull-left" style="font-weight:normal;">Scale</label>
-                                        <div id="edit-slider-3" class="pull-left" style="width:62%; margin-left:3%; margin-top:2%;">
-                                            <div id="slider-range-min-3"></div>
-
-                                        </div>
-                                    </div>
-
-                                    <div class="row">
-                                        <label class="pull-left" style="font-weight:normal;">Opacity</label>
-                                        <div id="edit-slider-4" class="pull-left" style="width:53%; margin-left:3%; margin-top:2%;">
-                                            <div id="slider-range-min-4"></div>
-                                        </div>
-                                    </div>
-
-                                    <div class="clearfix"></div>
-
-
-                                </div>
-                            </div>
-
-                        </div>
-                    </div>
-                    <div class="marginTopBtm10">
-                        <div class="well well-sm no-margin-btm">
-                            <div class="row">
-                                <div class="col-sm-12">
-                                    <div class="checkbox no-margin">
-                                        <label>
-                                            <input id="Outline-Option" onclick="enableDisableOutline()" type="checkbox" checked> Outline Option
-                                        </label>
-                                    </div>
-                                </div>
-                                <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;">
-
-                                            <input type="text" class="form-control borderColorCanvasPreview" data-control="saturation" style="display:none;" value="#0088cc">
-                                        </div>
+   
+    <div class="modal fade" id="messageModal" role="dialog" style="z-index:10;">
+        <div class="modal-dialog">
 
-
-                                    </label>
-                                </div>
-
-                                <div class="col-sm-6 setEnableDisableForEditShapeStyle">
-                                    <div class="form-horizontal">
-                                        <div class="form-group">
-                                            <label class="col-sm-3 control-label" style=" font-weight:normal; padding-top:9px;">Size</label>
-                                            <div class="col-sm-9 marginTop5">
-                                                <select id="borderWidthCanvasElement" class="form-control input-sm">
-                                                    <option value="1">1</option>
-                                                    <option value="2">2</option>
-                                                    <option value="3">3</option>
-                                                    <option value="4">4</option>
-                                                    <option value="5">5</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="marginTopBtm10">
-                        <div class="well well-sm no-margin-btm">
-                            <img id="imgOpacity" class="img-rounded img-responsive imgopacity" alt="..." src="content/images/blank-shape.jpg">
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-primary btn-sm" ng-click="setPropertiesForShapes('imgOpacity')">
-
-                        OK
-                    </button>
-                    <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button>
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
                 </div>
+                <div class="modal-title"></div>
+                <div class="modal-body">{{errorMassage}}</div>
+                <div class="modal-footer"> <button type="button" class="btn btn-primary" data-dismiss="modal">OK</button></div>
             </div>
         </div>
-    </div>-->
+    </div>
 
     <script>
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
index ce16ab2..251b6ba 100644
--- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
+++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -957,4 +957,29 @@ background-size:cover;
      {
          color: #fff;
     }
-    
\ No newline at end of file
+    
+     #messageModal .modal-dialog
+       {
+        width:300px
+    }
+    #messageModal .modal-content
+     {
+        
+        box-shadow: 0 0 40px rgba(0,0,0,.5);
+        border: rgba(0,0,0,0);
+    }
+     #messageModal .modal-body
+    {
+         text-align:center;
+    }
+    #messageModal .modal-header 
+    {
+        padding: 6px;
+         border-bottom: none;
+    }
+      #messageModal .modal-footer
+       {
+          border-top: none;
+           padding: 20px 10px; 
+           text-align:center;
+      }
\ No newline at end of file