diff --git a/app/assets/stylesheets/BSBMaterial/style.css b/app/assets/stylesheets/BSBMaterial/style.css
index a4620cf5..004439e9 100755
--- a/app/assets/stylesheets/BSBMaterial/style.css
+++ b/app/assets/stylesheets/BSBMaterial/style.css
@@ -11,7 +11,7 @@
   box-shadow: 0 1px 5px rgba(0, 0, 0, 0.3);
   border: none;
   position: fixed;
-  top: 0;
+  /*top: 0;*/
   left: 0;
   z-index: 12;
   width: 100%; }
@@ -6649,7 +6649,7 @@ fieldset[disabled] .form-control {
   box-shadow: 0 1px 5px rgba(0, 0, 0, 0.3);
   border: none;
   position: fixed;
-  top: 0;
+  /*top: 0;*/
   left: 0;
   z-index: 12;
   width: 100%; }
diff --git a/app/models/license.rb b/app/models/license.rb
index 5335d6c4..92781a22 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -159,12 +159,12 @@ class License
       Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
       if (@varified["status"])
         if old_renewable_date.to_date == @varified['renewable_date'].to_date
-          message = "*** License couldn't be verified. ***"
+          message = "*** License can't be verified. ***"
           status = 2
         elsif old_renewable_date.to_date < @varified['renewable_date'].to_date
           update_license("renewable_date", @varified['renewable_date'])
           status = 1
-          message = "*** License could be verified. ***"  
+          message = "*** License con be verified. ***"  
         end
         return status, message
         
diff --git a/app/views/layouts/CRM.html.erb b/app/views/layouts/CRM.html.erb
index 063080d5..5c2fc4b7 100755
--- a/app/views/layouts/CRM.html.erb
+++ b/app/views/layouts/CRM.html.erb
@@ -31,6 +31,7 @@
             <p>Please wait...</p>
         </div>
     </div>
+    <%= render 'shared/license_expire_warning' %>        
     <!-- #END# Page Loader -->
     <!-- Overlay For Sidebars -->
     <div class="overlay"></div>
@@ -59,8 +60,7 @@
                     </p>
                 <% end %>
             <% end %> 
-        <% end %>     
-        <%= render 'shared/license_expire_warning' %>        
+        <% end %>
         <%= yield %>     
     </section>
 </body>
diff --git a/app/views/layouts/OQS.html.erb b/app/views/layouts/OQS.html.erb
index b8a3058d..c4d18cab 100755
--- a/app/views/layouts/OQS.html.erb
+++ b/app/views/layouts/OQS.html.erb
@@ -35,6 +35,7 @@
             <p>Please wait...</p>
         </div>
     </div>
+    <%= render 'shared/license_expire_warning' %>        
     <!-- #END# Page Loader -->
     <!-- Overlay For Sidebars -->
     <div class="overlay"></div>
@@ -53,7 +54,6 @@
                 <%= message %>
               </div>
       <% end %>       
-        <%= render 'shared/license_expire_warning' %>      
         <%= yield %>     
     </section>
 </body>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 4b30ef25..44d3c36a 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -32,6 +32,7 @@
             <p>Please wait...</p>
         </div>
     </div>
+    <%= render 'shared/license_expire_warning' %>   
     <!-- #END# Page Loader -->
     <!-- Overlay For Sidebars -->
     <div class="overlay"></div>
@@ -57,7 +58,6 @@
                 data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
             </p>
         <% end %> 
-        <%= render 'shared/license_expire_warning' %>      
         <%= yield %>    
     </section>  
 </body>
diff --git a/app/views/layouts/inventory.html.erb b/app/views/layouts/inventory.html.erb
index 4a117634..9d52575f 100755
--- a/app/views/layouts/inventory.html.erb
+++ b/app/views/layouts/inventory.html.erb
@@ -31,6 +31,7 @@
             <p>Please wait...</p>
         </div>
     </div>
+    <%= render 'shared/license_expire_warning' %>        
     <!-- #END# Page Loader -->
     <!-- Overlay For Sidebars -->
     <div class="overlay"></div>
@@ -52,7 +53,6 @@
         <% end %>
 
       <% end %>     
-        <%= render 'shared/license_expire_warning' %>         
         <%= yield %>     
     </section>
 </body>
diff --git a/app/views/layouts/origami.html.erb b/app/views/layouts/origami.html.erb
index c3ada661..398fc691 100755
--- a/app/views/layouts/origami.html.erb
+++ b/app/views/layouts/origami.html.erb
@@ -31,6 +31,7 @@
             <p>Please wait...</p>
         </div>
     </div>
+    <%= render 'shared/license_expire_warning' %>      
     <!-- #END# Page Loader -->
     <!-- Overlay For Sidebars -->
     <div class="overlay"></div>
@@ -60,8 +61,7 @@
                 data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
             </p>
         <% end %> 
-        <%= render 'shared/license_expire_warning' %>      
-      <%= yield %>   
+        <%= yield %>   
     </section>
 </body>
      
\ No newline at end of file
diff --git a/app/views/layouts/waiter.html.erb b/app/views/layouts/waiter.html.erb
index 6ecfda70..885f9594 100755
--- a/app/views/layouts/waiter.html.erb
+++ b/app/views/layouts/waiter.html.erb
@@ -14,6 +14,7 @@
   </head>
 
   <body>
+    <%= render 'shared/license_expire_warning' %>      
     <%= render 'layouts/header' %>
     <div class="container-fluid">
       <% flash.each do |type, message| %>
@@ -22,7 +23,6 @@
 						    <%= message %>
 						  </div>
 			<% end %>
-      <%= render 'shared/license_expire_warning' %>      
       <%= yield %>
 
     </div>
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index e767bafe..c7b52bb8 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -1,5 +1,5 @@
 <!-- Column One -->
-<div class="row clearfix" style="">
+<div class="row clearfix m-top-100" style="">
   <div class="col-lg-7 col-md-7 col-sm-7"> 
     <p class="hidden filter"><%= @filter %></p>
     <div class="card">
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 27d13860..c0e3a61d 100644
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -4,7 +4,7 @@
 
 <% type = request.path_info.include?('quick_service') || request.path_info.include?('food_court')%>
 <% modify_order = request.path_info.include?('modify_order')%>
-<div class="container-fluid " style="padding:0px 3px 0px 3px;">
+<div class="container-fluid addorder-pages" style="padding:0px 3px 0px 3px;">
   <div id="oqs_loading_wrapper" style="display:none;">
     <div id="oqs_loading"></div>
   </div>
diff --git a/app/views/origami/cash_ins/new.html.erb b/app/views/origami/cash_ins/new.html.erb
index 5b23656e..675a82c4 100755
--- a/app/views/origami/cash_ins/new.html.erb
+++ b/app/views/origami/cash_ins/new.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid m-top-100">
   <div class='row'>
     <div class="col-lg-10 col-md-10 col-sm-10">
       <h2> <%= t :cash_in %> </h2>
diff --git a/app/views/origami/cash_outs/new.html.erb b/app/views/origami/cash_outs/new.html.erb
index ea83b2e0..f31feb62 100755
--- a/app/views/origami/cash_outs/new.html.erb
+++ b/app/views/origami/cash_outs/new.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid m-top-100">
   <div class='row'>
     <div class="col-lg-10 col-md-10 col-sm-10">
       <h2><%= t :cash_out %></h2>
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 5d24c9d1..2fa34e8c 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -1,4 +1,4 @@
- <div class="container-fluid">
+ <div class="container-fluid m-top-100">
  <div id="loading_wrapper" style="display:none;">
     <div id="loading"></div>
  </div>
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 39c33749..a583e659 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid m-top-100">
   <div id="loading_wrapper" style="display:none;">
     <div id="loading"></div>
   </div>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 8e3c3b18..c6bdfca3 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid m-top-100">
   <div id="loading_wrapper" style="display:none;">
     <div id="loading"></div>
   </div>
diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index 4355c06a..dcc6af33 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -1,6 +1,6 @@
 <%= stylesheet_link_tag    'order_reservation', media: 'all', 'data-turbolinks-track': 'reload' %>
 <%= javascript_include_tag 'order_reservation', 'data-turbolinks-track': 'reload' %> 
-<div class="container-fluid">
+<div class="container-fluid m-top-100">
   <!-- start count function -->
   <% 
     pending_count = 0
diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb
index 886eda51..06208b2f 100755
--- a/app/views/origami/other_charges/index.html.erb
+++ b/app/views/origami/other_charges/index.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid m-top-100">
 	<div class="row">
 		<!-- Column One -->
 		<div class="col-lg-6 col-md-6 col-sm-6">
@@ -202,7 +202,7 @@
     <%else%>
     <button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami/sale/<%=@sale_data.sale_id%>/<%=@cashier_type%>/payment'"><i class="material-icons">reply</i> Back </button>
     <%end%>
-  		<button id="charge_other" class="btn bg-primary btn-block action-btn">Enter</button>
+  		<button id="charge_other" class="btn bg-primary btn-block action-btn" style="height: 35px">Enter</button>
   	</div>
   </div>
 </div>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 6ed4044e..c9795298 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid m-top-100">
   <div id="loading_wrapper" style="display:none;">
     <div id="loading"></div>
   </div>
diff --git a/app/views/origami/pending_order/index.html.erb b/app/views/origami/pending_order/index.html.erb
index 903c13a5..fe8ba72f 100644
--- a/app/views/origami/pending_order/index.html.erb
+++ b/app/views/origami/pending_order/index.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid m-top-100">
     <div class="row clearfix">
         <!-- Column One -->
         <div class="col-lg-10 col-md-10 col-sm-10">
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index 73ee0040..9ad89797 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid m-top-100">
   <div class="row">
   <!-- Column One -->
     <div class="col-lg-5 col-md-5 col-sm-5">
diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb
index a752e5b5..ec529e8c 100755
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid m-top-100">
   <div id="loading_wrapper" style="display:none;">
     <div id="loading"></div>
   </div>
diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index 8bc99b8b..40e52db6 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid m-top-100">
   <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
       <div class="card">
diff --git a/app/views/renew_license/expire.html.erb b/app/views/renew_license/expire.html.erb
index 67e9fe1a..d29c5923 100644
--- a/app/views/renew_license/expire.html.erb
+++ b/app/views/renew_license/expire.html.erb
@@ -8,13 +8,24 @@
       text = "Your license will expire in #{day}."
     end
 %>
+<style>
+  .centered {
+    position: fixed;
+    /*width: 850px;*/
+
+    padding: 10px;
+    top: 50%;
+    left: 50%;
+    -webkit-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
+  }
+</style>
 <div class="container-fluid">
   <div class="row">
     <div class="col-sm-2"></div>
-
-    <div class="card col-md-8 h-100" style="padding-left: 60px;">
+    <div class="card col-sm-8 centered">
       <div class="card-block">
-        <h3 class="pt-2 d-inline">Renew Your License</h3>
+        <h3 class="pt-2 d-inline">Review Your License</h3>
         <%= link_to origami_dashboard_url do %>
           <img src="/image/logo.png" style="margin-left: 25pc; width: 150px">
         <% end %>
@@ -51,11 +62,10 @@
           <label class="card-subtitle mb-2 "><strong><%= @expired_at.to_date.strftime('%B %d, %Y') %></strong></label>
         </div>
       </div>
-
+      <br>
       <div class="col-md-12" style="padding-bottom: 20px;">
-        <%= link_to 'Home', origami_dashboard_url, class: 'btn btn-primary btn-lg' %> 
-        <%= link_to 'Renew License', renew_url, class: 'btn btn-primary btn-lg float-right m-l-5 m-r-5' %>
-        <button onclick="history.back();" type='button' class="btn btn-lg btn-default float-right">Cancel</button>
+        <%= link_to 'Review License', renew_url, class: 'btn btn-primary btn-lg float-right m-l-10 m-r-5' %>
+        <%= link_to 'Go To Home', origami_dashboard_url, class: 'btn btn-default btn-lg float-right' %> 
       </div>
     </div>
     <div class="col-sm-2"></div>
@@ -64,9 +74,9 @@
 
 <script>
   $(document).ready(function() {
-    $('.alert-warning, .navbar').hide()
+    $('.alert-danger, .navbar').hide()
     $('html, section').css('background-color', '#61B8C9')
-    $('html').css('overflow-x', 'hidden')
+    // $('html').css('overflow-x', 'hidden')
     $('section.content').css('margin', '70px 0 0 0')
   })
 </script>
diff --git a/app/views/shared/_license_expire_warning.html.erb b/app/views/shared/_license_expire_warning.html.erb
index 0949aff7..a1292d4c 100644
--- a/app/views/shared/_license_expire_warning.html.erb
+++ b/app/views/shared/_license_expire_warning.html.erb
@@ -10,12 +10,38 @@
 	end
 %>
 <% if license_status == 0 || license_status == 2 %>
-	<div class="alert alert-warning fade show" role="alert" style="margin-top: -15px;">
+	<div class="alert alert-danger fade show text-center" role="alert">
 	  <strong style="margin-left: 40px !important"><%= text %></strong> 
-	  <%= link_to 'Renew License', expire_url, class: 'btn btn-sm btn-primary', style: "margin-left: 40px !important"%>
-	  <button type="button" class="close" data-dismiss="alert" aria-label="Close" style="padding-top: 5px;">
+	  <%= link_to 'Review License', expire_url, class: 'btn btn-sm btn-primary', style: "margin-left: 20px !important"%>
+	  <button type="button" class="close btn-close" data-dismiss="alert" aria-label="Close" style="padding-top: 5px;">
 	    <span aria-hidden="true" class="text-white">&times;</span>
 	  </button>
 	</div>
 
-<% end %>
\ No newline at end of file
+<% end %>
+
+<script>
+	$(document).ready(function() {
+		if (<%= license_status %> == 1) {
+			$('.navbar').css("top", 0)
+			$('section.content').css('margin-top', '0 !important')
+		}
+		else {
+			$('.navbar').css("top", '45px')	
+			$('.block-header, .addorder-pages').css('margin-top', '115px')
+			$('.page-header, .m-top-100').css('margin-top', '100px')
+			$('.alert-danger').css({
+				'top': 0,
+				'position': 'fixed',
+				'z-index': 999,
+				'width': '100%'
+			})
+		}
+		$('.btn-close').on ('click', function() {
+			$('.navbar').css("top", '0')	
+			$('.block-header, .addorder-pages').css('margin-top', '')
+			$('.page-header, .m-top-100').css('margin-top', '')
+		})
+	})
+
+</script>
\ No newline at end of file
diff --git a/config/license.yml b/config/license.yml
index 6148ed67..edd39369 100644
--- a/config/license.yml
+++ b/config/license.yml
@@ -1,19 +1,17 @@
 ---
 localhost:
-  iv_key: c5bODYtxFPckKXr3bLPdnQ==
+  iv_key: 03TLQUDDVSOPa/lEEHqhVw==
   shop_name: scdemo3
   email: hanwintun@code2lab.com
   telephone: ''
   fax: ''
   address: ''
-  dbhost: eFiEpFewQVPPylY1pefN2ZIVmxg9v7G1YrnHtNIPIbQQg7WtffKz35uCcOwgwzEvCTPUhPQama4B80FHyTpn3Q==
-  dbschema: PRMtXnRsDZQjF319ItO7Lw==
-  dbusername: QYngtMBsTBV/B17XiH5zhQ==
-  dbpassword: vXsZqV2sJQ+tjIiGBb7N8A==
+  dbhost: gG0jQLrVX6l0dZaA5wVP9bNTrfgzotwAcjcFKQmM9WUQ5121pkwg+9mYh5XDrIwL4//1UNjRR6CNZPorBMGtAw==
+  dbschema: M9ddWoBb89JN51Ld1r7vTw==
+  dbusername: 8Lc2lKIyJld/xfG6+ZxcOw==
+  dbpassword: "+EhtSe5kJuVKp+wFMRlmoA=="
   api_token: UQFLAbMvJxUCnDVCOhIdqYZEGRqVQMvI
   app_token: DvRXGlomaBFpGVLYsidekVVZyqosntouTA
-  plan_sku: AqCfY9X2C03i+XBLnvRz5w==
-  renewable_date: 'MXf+rRgjWFxIRgpf+Aa4JA==
-
-'
-  plan_name: bDYhVmEo9MNZmfIxwxE30BFHUKWTDVkVDnUiE6htM5Y=
+  plan_sku: 2NY6p1HAlR7UqE8AsBEytg==
+  renewable_date: vlKVqrJyCB6LxXTkv63COg==
+  plan_name: 6NSPpVHcwHBoFZPcVNjkvD6F5quXIWVaWieCRzpspbE=