diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 9b129534..fc340d2c 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -187,7 +187,7 @@
                 </div>
               </div>
               <div id="order-detail-slimscroll" data-height="<%= @status_sale=="sale" ? 200 : 160%>">
-              <div class="card-text order-info" >
+              <div class="card-text" >
                 <table class="table table-striped" id="order-items-table">
                   <thead>
                   <tr>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 3285d1bf..aaf7ad58 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -162,7 +162,7 @@
 
          </div>
          <div id="order-detail-slimscroll" data-height="<%= @status_sale=="sale" ? 240 : 160%>">
-           <div class="card-text order-info">
+           <div class="card-text">
              <table class="table table-striped" id="order-items-table">
                <thead>
                  <tr>
diff --git a/app/views/settings/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb
index a64ceb22..30d59290 100755
--- a/app/views/settings/dining_charges/_form.html.erb
+++ b/app/views/settings/dining_charges/_form.html.erb
@@ -15,7 +15,7 @@
                 <i class="material-icons">access_time</i>
               </span>
                 <% if !@dining_charge.minimum_free_time.nil?%>
-                  <input type="text" name="dining_charge[minimum_free_time]" value="<%= @dining_charge.minimum_free_time.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Free Time(hh:mm)...">
+                  <input type="text" name="dining_charge[minimum_free_time]" value="<%= @dining_charge.minimum_free_time.utc.getlocal.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Free Time(hh:mm)...">
                 <% else %>
                    <input type="text" name="dining_charge[minimum_free_time]" class="timepicker form-control col-md-8" placeholder="Free Time(hh:mm)...">
                 <% end %>
@@ -28,7 +28,7 @@
               <i class="material-icons">access_time</i>
             </span>
             <% if !@dining_charge.charge_block.nil?%>
-            <input type="text" name="dining_charge[charge_block]" value="<%= @dining_charge.charge_block.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Time for Charges(hh:mm)...">
+            <input type="text" name="dining_charge[charge_block]" value="<%= @dining_charge.charge_block.utc.getlocal.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Time for Charges(hh:mm)...">
             <% else %>
             <input type="text" name="dining_charge[charge_block]" class="timepicker form-control col-md-8" placeholder="Time for Charges(hh:mm)...">
             <% end %>
@@ -43,7 +43,7 @@
               <i class="material-icons">access_time</i>
             </span>
             <% if !@dining_charge.time_rounding_block.nil?%>
-            <input type="text" name="dining_charge[time_rounding_block]" value="<%= @dining_charge.time_rounding_block.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Rounding Time...">
+            <input type="text" name="dining_charge[time_rounding_block]" value="<%= @dining_charge.time_rounding_block.utc.getlocal.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Rounding Time...">
             <% else %>
             <input type="text" name="dining_charge[time_rounding_block]" class="timepicker form-control col-md-8" placeholder="Rounding Time...">
             <% end %>