diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index ceda0d8a..0023c41f 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -104,10 +104,10 @@ $(document).on('turbolinks:load', function() {
 
 });
 
-$(document).on("focus", "[data-behaviour~='datepicker']", function(e){
-  $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
-  $('.dropdown-toggle').dropdown();
-});
+// $(document).on("focus", "[data-behaviour~='datepicker']", function(e){
+//   $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
+//   $('.dropdown-toggle').dropdown();
+// });
 
 function export_to(path)
 {
diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css
index db9581fa..eae4b190 100644
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -198,6 +198,28 @@ section.content {
     background-color: #007d72 !important;
 }
 
+.m-t-1{
+  margin-top: 1px;
+}
+.m-t-2{
+  margin-top: 2px;
+}
+.m-t-3{
+  margin-top: 3px;
+}
+.m-t-4{
+  margin-top: 4px;
+}
+.m-t-7{
+  margin-top: 7px;
+}
+
+.bmd-form-group .bmd-label-static{
+  font-size: 0.85rem;
+}
+.form-group {
+    margin-bottom: 15px;
+}
 /* FORM */
 .input-group-addon {
     padding: 0rem 0rem;
diff --git a/app/controllers/reports/commission_controller.rb b/app/controllers/reports/commission_controller.rb
index 98f98457..aeaa0a11 100755
--- a/app/controllers/reports/commission_controller.rb
+++ b/app/controllers/reports/commission_controller.rb
@@ -2,18 +2,21 @@ class Reports::CommissionController < BaseReportController
   # authorize_resource :class => false
 
   def index
-    from_date = DateTime.now.beginning_of_day.utc.getlocal
-    to_date = DateTime.now.end_of_day.utc.getlocal
-    unless params[:daterange].blank?
-      from_date = Date.parse(params[:daterange].split(' - ')[0]).beginning_of_day.utc.getlocal
-      to_date = Date.parse(params[:daterange].split(' - ')[1]).end_of_day.utc.getlocal
-      @daterange = params[:daterange]
-    end
+    # from_date = DateTime.now.beginning_of_day.utc.getlocal
+    # to_date = DateTime.now.end_of_day.utc.getlocal
+    # unless params[:daterange].blank?
+    #   from_date = Date.parse(params[:daterange].split(' - ')[0]).beginning_of_day.utc.getlocal
+    #   to_date = Date.parse(params[:daterange].split(' - ')[1]).end_of_day.utc.getlocal
+    #   @daterange = params[:daterange]
+    # end
+    from_date, to_date  = get_date_range_from_params
+
     commissioner = params[:commissioner].to_i
     @com_id = commissioner
     @commissioner = Commissioner.active.all
 
     @transaction = ProductCommission.get_transaction(from_date, to_date, commissioner)
+  
     @from       = from_date
     @to         = to_date
 
diff --git a/app/controllers/reports/stock_check_controller.rb b/app/controllers/reports/stock_check_controller.rb
index c6799cb1..c9622999 100755
--- a/app/controllers/reports/stock_check_controller.rb
+++ b/app/controllers/reports/stock_check_controller.rb
@@ -2,13 +2,14 @@ class Reports::StockCheckController < BaseReportController
   # authorize_resource :class => false
 
   def index
-    from_date = DateTime.now.beginning_of_day.utc.getlocal
-    to_date = DateTime.now.end_of_day.utc.getlocal
-    unless params[:daterange].blank?
-      from_date = Date.parse(params[:daterange].split(' - ')[0]).beginning_of_day.utc.getlocal
-      to_date = Date.parse(params[:daterange].split(' - ')[1]).end_of_day.utc.getlocal
-      @daterange = params[:daterange]
-    end
+    # from_date = DateTime.now.beginning_of_day.utc.getlocal
+    # to_date = DateTime.now.end_of_day.utc.getlocal
+    # unless params[:daterange].blank?
+    #   from_date = Date.parse(params[:daterange].split(' - ')[0]).beginning_of_day.utc.getlocal
+    #   to_date = Date.parse(params[:daterange].split(' - ')[1]).end_of_day.utc.getlocal
+    #   @daterange = params[:daterange]
+    # end
+    from_date, to_date  = get_date_range_from_params
     @item_code = params[:item_code]
     @inventory_definitions = InventoryDefinition.active.all
 
diff --git a/app/views/inventory/inventory/_inventory_list.html.erb b/app/views/inventory/inventory/_inventory_list.html.erb
index 91a4ac94..bd5f5c38 100755
--- a/app/views/inventory/inventory/_inventory_list.html.erb
+++ b/app/views/inventory/inventory/_inventory_list.html.erb
@@ -1,48 +1,34 @@
 
-<div class="row">
-  <div class="col-md-8"><h2> Inventoy Product Lists</h2></div>
-  <div class="col-md-4"><button id='new_inventory_product' class='btn bg-blue waves-effect' style='margin-top:15px;'>New Inventory Product</button></div>
-</div>
+<table class="table table-striped">
+  <tr>
+    <th>#</th>
+    <th>Product</th>
+    <th>Min Order</th>
+    <th>Max Stock</th>
+    <th>Created by</th>
+    <th>Created Time</th>
+  </tr>
+  <%
+  count = 0
+  @products.each do |item|
+    count += 1
+    %>
+    <tr>
+      <td><%= count %></td>
+      <td>
+        <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%>
+        <% if menu_item.nil? %>
+        <%= Product.find_by_item_code(item.item_code).name rescue "-" %>
+        <% else %>
+        <%= menu_item.menu_item.name rescue "-" %>
+        - <%= menu_item.item_instance_name rescue "-" %>
+        <% end %>
+      </td>
+      <td><%= item.min_order_level %></td>
+      <td><%= item.max_stock_level %></td>
+      <td><%= Employee.find(item.created_by).name rescue '-' %></td>
+      <td><%= item.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></td>
+    </tr>
+    <% end %>
+  </table>
 
-<div class="row">
-  <div class="col-md-12">
-    <table class="table table-striped">
-      <tr>
-        <th>#</th>
-        <th>Product</th>
-        <th>Min Order</th>
-        <th>Max Stock</th>
-        <th>Created by</th>
-        <th>Created Time</th>
-      </tr>
-      <%
-      count = 0
-      @products.each do |item|
-      count += 1
-      %>
-        <tr>
-          <td><%= count %></td>
-          <td>
-            <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%>
-            <% if menu_item.nil? %>
-                <%= Product.find_by_item_code(item.item_code).name rescue "-" %>
-            <% else %>
-                <%= menu_item.menu_item.name rescue "-" %>
-                - <%= menu_item.item_instance_name rescue "-" %>
-            <% end %>
-          </td>
-          <td><%= item.min_order_level %></td>
-          <td><%= item.max_stock_level %></td>
-          <td><%= Employee.find(item.created_by).name rescue '-' %></td>
-          <td><%= item.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></td>
-        </tr>
-      <% end %>
-    </table>
-  </div>
-</div>
-
-<script>
-$('#new_inventory_product').on('click',function(){
-   window.location.href = '/inventory/inventory_definitions/new';
-})
-</script>
diff --git a/app/views/inventory/inventory/index.html.erb b/app/views/inventory/inventory/index.html.erb
index 6149198b..ab6b3855 100755
--- a/app/views/inventory/inventory/index.html.erb
+++ b/app/views/inventory/inventory/index.html.erb
@@ -1,17 +1,48 @@
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-lg-10 col-md-10 col-sm-10">
+<div class="page-header">
+ <ol class="breadcrumb">
+  <li class="breadcrumb-item"><a href="<%= dashboard_path  %>">Home</a></li>
+  <li class="breadcrumb-item active">Inventory</li>
+  <span class="float-right">
+    <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
+  </span>
+</ol>
+</div>
+
+
+<div class="row">
+    <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+      <div class="m-b-10 clearfix">
+          <button id="stock_check_report" type="button" class="btn bg-blue float-right waves-effect" style='margin-left:5px;'> Stock Check Report
+          </button>
+          <button id="stock_taking" type="button" class="btn bg-blue float-right waves-effect" style='margin-left:5px;'> New Stock Taking</button>
+          <button id='new_inventory_product' class='btn btn-primary  float-right waves-effect' style='margin-left:5px;'><%= t("views.btn.new") + " " + (t :inventory) %>
+         </button>     
+      </div>
+      <div class="card">
       <%= render 'inventory_list' %>
     </div>
-    <div class="col-lg-2 col-md-2 col-sm-2">
-      <% if current_login_employee.role == "administrator" || current_login_employee.role == 'manager' %>
-      <button id="back" type="button" class="btn bg-default waves-effect"> Back</button>
-      <% end %>
-      <button id="stock_taking" type="button" class="btn bg-blue waves-effect"> New Stock Taking</button>
-      <button id="stock_check_report" type="button" class="btn bg-blue waves-effect"> Stock Check Report</button>
-    </div>
+  </div>
+  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+    <div class="card">
+      <div class="body">
+        <h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
+        <p>
+        1) <%= t("views.btn.new") + " " + (t :inventory) %> - to create new inventory <br>
+        </p>
+        <p>
+        2) New Stock Taking - to create new Stock Taking <br>
+        </p>
+        <p>
+        3) Stock Check Report - to go Stock Check Report List <br>
+        </p>
+        <h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
+        <p>1) Home / Back - go to dashboard</p>
+      </div>
+    </div>  
   </div>
 </div>
+
+
 <script>
   $('#stock_taking').on('click', function () {
     window.location.href = '<%= inventory_stock_checks_path %>';
@@ -21,8 +52,8 @@
     window.location.href = '<%= reports_stock_check_index_path %>';
   });
 
-  $('#back').on('click', function () {
-    window.location.href = '<%= dashboard_path %>';
-  });
+  $('#new_inventory_product').on('click',function(){
+   window.location.href = '/inventory/inventory_definitions/new';
+})
 
 </script>
diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb
index 7a5f06ff..e7f3198d 100755
--- a/app/views/inventory/inventory_definitions/_form.html.erb
+++ b/app/views/inventory/inventory_definitions/_form.html.erb
@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
    <div class="p-l-10">
      <%= simple_form_for([:inventory, @inventory_definition]) do |f| %>
     <%= f.error_notification %>
@@ -10,8 +10,8 @@
         <% Product.order("name desc").pluck(:name, :item_code).each do |p| %>
             <% arr.push(p) %>
         <% end %>
-        <div class="col-md-3">
-          <label class="control-label"><abbr title="required">*</abbr> Item</label>
+        <div class="col-md-4">
+          <label class="control-label"><abbr title="required">*</abbr>Select Item</label>
           <select class="form-control item_code_place" id="item">
             <% if !@inventory_definition.item_code.nil? %>
                 <% menuiteminstance = MenuItemInstance.find_by_item_instance_code(@inventory_definition.item_code) %>
@@ -21,7 +21,7 @@
                     <% code = menuiteminstance.menu_item.item_code %>
                 <% end %>
             <% end %>
-            <option value=""></option>
+            <option value="">Select Item</option>
             <% arr.each do |a| %>
                 <% if a[1] == code %>
                     <option value="<%= a[1] %>" selected><%= a[0] %></option>
@@ -48,19 +48,32 @@
     </div>
 
     <div class="form-actions">
-      <%= f.submit 'Submit', class: 'btn bg-blue waves-effect' %>
+      <%= f.submit t("views.btn.submit"), class: 'btn bg-blue waves-effect' %>
     </div>
 
 <% end %>
    </div>
     </div>
- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+ <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+         <h5><i class="material-icons md-18">list INPUT LISTS</i> </h5>
+          <p>
+          1) Select Item - select to create for new inventory <br>
+          </p>
+           <p>
+          2) Min Order Level - to write  minimun number with type Integer/Numeric <br>
+          </p>
+           <p>
+          3) Max Stock Level - to write  minimun number with type Integer/Numeric for check stock<br>
+          </p>
+          <h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
+          <p>
+          1) <%= t("views.btn.submit") %> - to create new inventory <br>
+          </p>
+          
+          <h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
+          <p>1) Home / Back - go to dashboard</p>
       </div>
     </div>  
   </div>
@@ -70,10 +83,10 @@
 <script>
 
     $(document).ready(function () {
-        $(".item_code_place").select2({
-            placeholder: 'Select Item'
-        });
-        $("select#inventory_definition_item_code").select2();
+        // $(".item_code_place").select2({
+        //     placeholder: 'Select Item'
+        // });
+        // $("select#inventory_definition_item_code").select2();
 
         $(".item_code_place").on('change', function (event) {
             var ajax_url = "<%= settings_find_item_instance_path	 %>";
@@ -90,7 +103,7 @@
                         $("select#inventory_definition_item_code").append(itemlist);
                     }
 //                    $("select#inventory_definition_item_code").append(itemlist);
-                    $("select#inventory_definition_item_code").select2();
+                    // $("select#inventory_definition_item_code").select2();
                 }
             });
         });
diff --git a/app/views/inventory/inventory_definitions/new.html.erb b/app/views/inventory/inventory_definitions/new.html.erb
index 621a2f1e..db699913 100755
--- a/app/views/inventory/inventory_definitions/new.html.erb
+++ b/app/views/inventory/inventory_definitions/new.html.erb
@@ -2,7 +2,7 @@
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
     <li class="breadcrumb-item"><a href="<%= inventory_path %>">Product Inventory</a></li>
-    <li class="breadcrumb-item active">Edit</li>
+    <li class="breadcrumb-item active">New</li>
     <span class="float-right">
       <%= link_to t('.back', :default => t("views.btn.back")), inventory_path %>
     </span>
diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb
index 69af59a4..8d133815 100755
--- a/app/views/inventory/stock_checks/index.html.erb
+++ b/app/views/inventory/stock_checks/index.html.erb
@@ -1,85 +1,95 @@
+<div class="page-header">
+ <ol class="breadcrumb">
+  <li class="breadcrumb-item"><a href="<%= dashboard_path  %>">Home</a></li>
+  <li class="breadcrumb-item active">Stock Check</li>
+  <span class="float-right">
+    <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
+  </span>
+</ol>
+</div>
+
+
 <div class="row">
-  <div class="col-md-6">
-    <div class="row">
-      <div class="col-md-12">
+  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+    <!-- <div class="m-b-10 clearfix">
+      <%= link_to t("views.btn.new"),new_settings_account_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+    </div -->
+    <div class="card">
+      <div class="p-l-15 p-r-15 p-t-10">
+        <div class="row">
+          <div class="col-md-6">
+                <div class="form-group">
+                  <div class="col-lg-10 col-md-10 col-sm-8 col-xs-7">
+                        <!-- <label for="remark">Remark</label> -->
+                         <input type='text' id='stock_check_reason' class='form-control' placeholder="Set Stock Check Reason" value=''/>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="col-lg-10 col-md-10 col-sm-8 col-xs-7">
+                     <!-- <label for="password_2">Item</label> -->
+                        <select class='form-control' id='product_sku'>
+                          <option value="">Select Product</option>
+                          <% @inventory_definitions.each do |id| %>
+                          <option value="<%= id.item_code %>">
+                            <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
+                            <% if menu_item.nil? %>
+                            <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
+                            <% else %>
+                            <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
+                            <% end %>
+                          </option>
+                          <% end %>
+                        </select>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="col-lg-10 col-md-10 col-sm-8 col-xs-7">
+                    <!-- <label for="email_address_2">Qty</label> -->
+                        <input type='text' class='form-control' placeholder="Qty" id='product_qty' value=''/>
+                  </div>
+                </div>
+                
+                <div class="form-group">
+                  <div class="col-md-4">
+                     <button class="btn btn-primary form-control" id='save_to_stock_check'> Save</button>
+                  </div>
+                </div>
+          </div>
 
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-md-12">
-        <input type='text' id='stock_check_reason' class='form-control' placeholder="Set Stock Check Reason" value=''/>
-      </div>
-    </div>
-    <br>
-    <div class="row">
-      <div class="col-md-2"></div>
-      <div class="col-md-2">
-        Item
-      </div>
-      <div class="col-md-7">
-        <select class='form-control' id='product_sku'>
-          <option value="">Select Product</option>
-          <% @inventory_definitions.each do |id| %>
-              <option value="<%= id.item_code %>">
-                <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
-                <% if menu_item.nil? %>
-                    <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
-                <% else %>
-                    <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
-                <% end %>
-              </option>
-          <% end %>
-        </select>
-      </div>
-    </div>
-    <br>
-    <div class="row">
-      <div class="col-md-2"></div>
-      <div class="col-md-2">
-        Qty
-      </div>
-      <div class="col-md-7">
-        <input type='text' class='form-control' placeholder="Qty" id='product_qty' value=''/>
-      </div>
-    </div>
-    <br>
-    <div class="row">
-      <div class="col-md-4"></div>
-      <div class="col-md-7">
-        <button class="btn btn-primary form-control" id='save_to_stock_check'> Save</button>
+          <div class="col-md-6">
+            <table class="table table-striped" id='stock_item'>
+              <tr>
+                <!--<th>#</th>-->
+                <th>Product</th>
+                <th>Balance</th>
+                <th><button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> Finish</button></th>
+              </tr>
+              <!-- <tr>
+                <td colspan="3">
+                  <button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> Finish</button></td>
+                </tr> -->
+              </table>
+          </div>
+          
+        </div>
       </div>
     </div>
   </div>
-
-  <div class="col-md-5">
-    <div class="row">
-      <div class="col-md-12">
-        <table class="table table-striped" id='stock_item'>
-          <tr>
-            <!--<th>#</th>-->
-            <th>Product</th>
-            <th>Balance</th>
-            <th></th>
-          </tr>
-        </table>
+  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+    <div class="card">
+      <div class="body">
+        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
       </div>
-    </div>
-  </div>
-  <div class="col-md-1">
-    <div class="row">
-      <button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='back'> Back</button>
-      <button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> Finish</button>
-    </div>
+    </div>  
   </div>
 </div>
 
 <script>
-    $(document).ready(function () {
-        $('#product_sku').select2({
-            allowClear: true,
-            placeholder: 'Select Product'
-        })
-    });
 
     var count = 0;
 
@@ -92,8 +102,8 @@
             //+ '<td>' + count + '</td>'
             + '<td><input type=hidden value="' + product_sku + '" id="item_sku_' + count + '" name=' + count + '/>'
             + product_name + '</td>'
-            + '<td><input type=text value="' + product_qty + '" id="item_qty_' + count + '" name=' + count + '/></td>'
-            + '<td><input type=button value="X" id="item_remove_' + count + '" name=' + count + ' onclick="remove_row('+ count +')"/></td>'
+            + '<td><input type=text value="' + product_qty + '" class="form-control col-md-9" id="item_qty_' + count + '" name=' + count + '/></td>'
+            + '<td><input type=button value="X" class="btn btn-danger p-l-15 p-r-15" id="item_remove_' + count + '" name=' + count + ' onclick="remove_row('+ count +')"/></td>'
             + '</tr>';
         $('#stock_item').append(tr);
 //        $('#product_sku').val('');
@@ -124,10 +134,6 @@
         })
     });
 
-    $('#back').on('click', function () {
-        window.location.href = '/inventory';
-    });
-
     function remove_row(row) {
         $("#item_remove_"+row).parent().parent().remove();
     }
diff --git a/app/views/inventory/stock_checks/show.html.erb b/app/views/inventory/stock_checks/show.html.erb
index f4af6db0..fca98c9b 100755
--- a/app/views/inventory/stock_checks/show.html.erb
+++ b/app/views/inventory/stock_checks/show.html.erb
@@ -1,72 +1,92 @@
+<div class="page-header">
+ <ol class="breadcrumb">
+  <li class="breadcrumb-item"><a href="<%= dashboard_path  %>">Home</a></li>
+  <li class="breadcrumb-item"><a href="<%=inventory_stock_checks_path%>"></a>Stock Check</li>
+  <li class="breadcrumb-item active">Detail</li>
+  <span class="float-right">
+    <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
+  </span>
+</ol>
+</div>
+
 <div class="row">
-  <input type='hidden' id='stock_check_id' value='<%= @check.id %>'/>
-  <div class="col-md-10">
-    <div class="row">
-      <div class="col-md-2">
-        Check by
-      </div>
-      <div class="col-md-8">
-        <%= Employee.find(@check.check_by).name rescue '' %>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-md-2">
-        Check At
-      </div>
-      <div class="col-md-8">
-        <%= @check.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></div>
-    </div>
-    <div class="row">
-      <div class="col-md-2">
-        Reason
-      </div>
-      <div class="col-md-8">
-        <%= @check.reason %>
-      </div>
-    </div>
-    <br>
-    <div class="row">
-      <table class="table table-striped col-md-12">
-        <tr>
-          <th>#</th>
-          <th>Product</th>
-          <th>Stock Count</th>
-          <th>Stock Balance</th>
-          <th>Different</th>
-          <th>Remark</th>
-        </tr>
-        <%
-          count = 0
-          @check.stock_check_items.each do |item|
-            count += 1
-        %>
-            <tr>
-              <td><%= count %></td>
-              <td>
-                <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%>
-                <% if menu_item.nil? %>
-                    <%= Product.find_by_item_code(item.item_code).name rescue "-" %>
-                <% else %>
-                    <%= menu_item.menu_item.name rescue "-" %>
-                    - <%= menu_item.item_instance_name rescue "-" %>
-                <% end %>
-              </td>
-              <td><%= item.stock_count %></td>
-              <td><%= item.stock_balance %></td>
-              <td><%= item.different %></td>
-              <td><%= item.remark %></td>
-            </tr>
-        <% end %>
-      </table>
+  <div class="col-xs-12 col-sm-12 col-md-10 col-lg-10">
+    <div class="card">
+        <input type='hidden' id='stock_check_id' value='<%= @check.id %>'/>
+        <div class="p-l-20 p-t-15">
+           <div class="row">
+            <div class="col-md-2">
+              Check by
+            </div>
+            <div class="col-md-8">
+              <%= Employee.find(@check.check_by).name rescue '' %>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-md-2">
+              Check At
+            </div>
+            <div class="col-md-8">
+              <%= @check.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %>
+            </div>
+          </div>
+          <div class="row">
+              <div class="col-md-2">
+                Reason
+              </div>
+              <div class="col-md-8">
+                <%= @check.reason %>
+              </div>
+          </div>
+        </div>
+        <br>
+        <div class="table-responsive">
+              <table class="table table-striped col-md-12">
+                <tr>
+                  <th>#</th>
+                  <th>Product</th>
+                  <th>Stock Count</th>
+                  <th>Stock Balance</th>
+                  <th>Different</th>
+                  <th>Remark</th>
+                </tr>
+                <%
+                count = 0
+                @check.stock_check_items.each do |item|
+                  count += 1
+                  %>
+                  <tr>
+                    <td><%= count %></td>
+                    <td>
+                      <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%>
+                      <% if menu_item.nil? %>
+                      <%= Product.find_by_item_code(item.item_code).name rescue "-" %>
+                      <% else %>
+                      <%= menu_item.menu_item.name rescue "-" %>
+                      - <%= menu_item.item_instance_name rescue "-" %>
+                      <% end %>
+                    </td>
+                    <td><%= item.stock_count %></td>
+                    <td><%= item.stock_balance %></td>
+                    <td><%= item.different %></td>
+                    <td><%= item.remark %></td>
+                  </tr>
+                  <% end %>
+                </table>
+         </div>
     </div>
   </div>
-  <div class="col-md-2">
-    <button id="back" type="button" class="btn btn-block btn-primary"> Back</button>
-    <button id="save_to_journal" type="button" class="btn btn-block btn-primary"> Save to Journal</button>
-    <button id="print" type="button" class="btn btn-block btn-primary"> Print</button>
+  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
+
+      <div class="body">
+              <button id="save_to_journal" type="button" class="btn btn-block btn-primary"> Save to Journal</button>
+              <button id="print" type="button" class="btn btn-block btn-primary"> Print</button>
+      </div>
+
   </div>
 </div>
 
+
 <script>
 
     $('#save_to_journal').on('click', function () {
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index bf91713e..76d51afc 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -153,12 +153,8 @@
 					<span><%= t :printer %></span>
 				</a>
 			</li>
-			<li>
-				<a href="<%= settings_products_path %>">
-					<i class="material-icons col-brown">donut_large</i>
-					<span><%= t :products %></span>
-				</a>
-			</li>
+			
+
 			<li>
 				<a href="<%= settings_tax_profiles_path %>">
 					<i class="material-icons col-green">donut_large</i>
@@ -177,6 +173,30 @@
 					<span><%= t :accounts %></span>
 				</a>
 			</li>
+			<li>
+				<a href="<%= settings_products_path %>">
+					<i class="material-icons col-brown">donut_large</i>
+					<span><%= t :products %></span>
+				</a>
+			</li>
+			<li>
+				<a href="<%= settings_promotions_path %>">
+					<i class="material-icons col-red">donut_large</i>
+					<span><%= t :promotions %></span>
+				</a>
+			</li>
+			<li>
+				<a href="<%= settings_commissions_path %>">
+					<i class="material-icons col-green">donut_large</i>
+					<span><%= t :commissions %></span>
+				</a>
+			</li>
+			<li>
+				<a href="<%= settings_commissioners_path %>">
+					<i class="material-icons col-teal">donut_large</i>
+					<span><%= t :commissioners %></span>
+				</a>
+			</li>
 		</ul>
 	</div>
 	<!-- #Menu -->
diff --git a/app/views/reports/commission/_commission_report_filter.html.erb b/app/views/reports/commission/_commission_report_filter.html.erb
index b5791993..bb04b4f5 100755
--- a/app/views/reports/commission/_commission_report_filter.html.erb
+++ b/app/views/reports/commission/_commission_report_filter.html.erb
@@ -1,41 +1,50 @@
-
+<div class="p-l-15">
 <%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
   <% if period_type != false %>
-  <div class="row">
+    <div class="row">
 
-    <div class="col-lg-2 col-md-2 col-sm-2">
-      <label class="">Select Date Range</label>
-      <% if @daterange %>
-      <input class="form-control" name="daterange" id="daterange" value="<%= @daterange %>" type="text" placeholder="Date Range" readonly="true">
-      <% else %>
-      <input class="form-control" name="daterange" id="daterange" type="text" placeholder="Date Range" readonly="true">
-      <% end %>
+        <!-- <div class="col-lg-2 col-md-2 col-sm-2">
+          <label class="">Select Date Range</label>
+          <% if @daterange %>
+          <input class="form-control" name="daterange" id="daterange" value="<%= @daterange %>" type="text" placeholder="Date Range" readonly="true">
+          <% else %>
+          <input class="form-control" name="daterange" id="daterange" type="text" placeholder="Date Range" readonly="true">
+          <% end %>
+        </div> -->
+        <div class="col-lg-3 col-md-3 col-sm-3">          
+        <!-- <label class="">Select Shift Period</label> -->
+        <label class="font-14">From</label>
+        <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+      </div>
+      <div class="col-lg-3 col-md-3 col-sm-3">
+        <label class="font-14">To</label>
+        <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+      </div>
+        <div class="col-lg-2 col-md-2 col-sm-2">
+          <label class="font-14">Commissioner</label>
+          <select class="form-control" name="commissioner" id="commissioner">
+            <option value=""></option>
+            <% @commissioner.each do |c| %>
+            <% if @com_id == c.id %>
+            <option value="<%= c.id %>" selected><%= c.name %></option>
+            <% else %>
+            <option value="<%= c.id %>"><%= c.name %></option>
+            <% end %> %>
+            <% end %>
+          </select>
+        </div>
+        <div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
+        <br>
+          <input type="submit" value="Generate Report" class='btn btn-info wave-effects'>
+        </div>
+        <!-- <div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
+          <input type="button" value="Clear Filter" id="clear_filter" class='btn btn-danger'>
+        </div> -->
     </div>
-    <div class="col-lg-2 col-md-2 col-sm-2">
-      <label class="">Commissioner</label>
-      <select class="form-control" name="commissioner" id="commissioner">
-        <option value=""></option>
-        <% @commissioner.each do |c| %>
-        <% if @com_id == c.id %>
-        <option value="<%= c.id %>" selected><%= c.name %></option>
-        <% else %>
-        <option value="<%= c.id %>"><%= c.name %></option>
-        <% end %> %>
-        <% end %>
-      </select>
-    </div>
-    <div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
-      <input type="submit" value="Generate Report" class='btn btn-primary'>
-    </div>
-    <div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
-      <input type="button" value="Clear Filter" id="clear_filter" class='btn btn-danger'>
-    </div>
-  </div>
   <% end %>
-
 <% end %>
-
-<script type="text/javascript">
+</div>
+<!-- <script type="text/javascript">
 
     $(document).ready(function () {
 
@@ -80,3 +89,4 @@
     });
 
 </script>
+ -->
\ No newline at end of file
diff --git a/app/views/reports/commission/index.html.erb b/app/views/reports/commission/index.html.erb
index 31e333f7..fd67c441 100755
--- a/app/views/reports/commission/index.html.erb
+++ b/app/views/reports/commission/index.html.erb
@@ -18,7 +18,7 @@
 <!-- <div class="container"> -->
   <!-- <div class="row"> -->
     <div class="text-right">
-      <a href="javascript:export_to('<%= reports_commission_index_path %>.xls')" class="btn btn-default">Export to
+      <a href="javascript:export_to('<%= reports_commission_index_path %>.xls')" class="btn btn-info wave-effects">Export to
         Excel</a>
     </div>
   <!-- </div> -->
@@ -30,7 +30,7 @@
       <table class="table table-striped">
         <thead>
         <tr>
-          <th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
+          <th colspan="9"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
         </tr>
         <tr>
           <th>Sale</th>
diff --git a/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb b/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
index 83575970..9423e4b5 100755
--- a/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
@@ -1,45 +1,46 @@
+<div class="p-l-15">
+	<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+		<% if period_type != false %>
+			<div class="row">
+				<div class="form-group col-md-2">
+					<label class="font-20">Select Period</label>
+					<select name="period" id="sel_period" class="form-control">
+						<option value="">Select Period</option>
+						<option value="0">Today</option>
+						<option value="1">Yesterday</option>
+						<option value="2">This week</option>
+						<option value="3">Last week</option>
+						<option value="4">Last 7 days</option>
+						<option value="5">This month</option>
+						<option value="6">Last month</option>
+						<option value="7">Last 30 days</option>
+						<option value="8">This year</option>
+						<option value="9">Last year</option>
+					</select>
+				</div>
 
-<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
-	<% if period_type != false %>
-		<div class="row">
-			<div class="form-group col-md-2">
-				<label>Select Period</label>
-				<select name="period" id="sel_period" class="form-control">
-					<option value="">Select Period</option>
-					<option value="0">Today</option>
-					<option value="1">Yesterday</option>
-					<option value="2">This week</option>
-					<option value="3">Last week</option>
-					<option value="4">Last 7 days</option>
-					<option value="5">This month</option>
-					<option value="6">Last month</option>
-					<option value="7">Last 30 days</option>
-					<option value="8">This year</option>
-					<option value="9">Last year</option>
-				</select>
-			</div>
-
-			<div class="form-group col-md-2">					
-				<!-- <label class="">Select Shift Period</label> -->
-				<label class="">From</label>
-				<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
-			</div>
-			<div class="form-group col-md-2">
-				<label class="">To</label>
-				<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
-			</div>
-			<div class="form-group col-md-3">
-				<label class="">All Shift</label>
-				<select class="form-control select" name="shift_name" id="shift_name" >
-				</select>
-			</div>
-			<div class="form-group col-md-1 margin-top-20">
-				<input type="submit" value="Generate Report" class='btn btn-primary'>
-			</div>							
-		</div>													
-	<% end %>
-
-<% end %>		
+				<div class="form-group col-md-2">					
+					<!-- <label class="">Select Shift Period</label> -->
+					<label class="font-20">From</label>
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+				</div>
+				<div class="form-group col-md-2">
+					<label class="font-20">To</label>
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+				</div>
+				<div class="form-group col-md-3">
+					<label class="font-20">All Shift</label>
+					<select class="form-control select" name="shift_name" id="shift_name" >
+					</select>
+				</div>
+				<div class="form-group col-md-1 ">
+				<br>
+					<input type="submit" value="Generate Report" class='btn btn-primary'>
+				</div>							
+			</div>													
+		<% end %>
+	<% end %>	
+</div>	
 
 <script type="text/javascript">
 	$(function(){
diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb
index 7cc0112c..38afa734 100755
--- a/app/views/reports/credit_payment/index.html.erb
+++ b/app/views/reports/credit_payment/index.html.erb
@@ -1,10 +1,12 @@
 <div class="page-header">
-	<ul class="breadcrumb">
-		<li><a href="<%= dashboard_path %>">Home</a></li>
-		<li>Credit Payment List Report</li>
-	</ul>
+	<ol class="breadcrumb">
+		<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+		<li class="breadcrumb-item active">Credit Payment Report</li>
+		<span class="float-right">
+			<%= link_to 'Back', dashboard_path %>
+		</span>
+	</ol>
 </div>
-
 <!-- <div class="container"> -->
 	<%= render :partial=>'shift_sale_report_filter',
 	:locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_credit_payment_index_path} %>
@@ -14,7 +16,7 @@
  <!-- <div class="container"> -->
 	<!-- <div class="row"> -->
 		<div class="text-right">
-			<a href="javascript:export_to('<%=reports_credit_payment_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+			<a href="javascript:export_to('<%=reports_credit_payment_index_path%>.xls')" class = "btn btn-info wave-effects">Export to Excel</a>
 		</div>	  			
 	<!-- </div> -->
    <!--  </div>  -->
@@ -32,7 +34,7 @@
 				<% end %>		  
 				<tr>
 					<th> Shift Name </th>
-				  	<th> Receive No</th>
+				  	<th> Receipt No</th>
 				   	<th> Cashier Name</th>
 				  	<th> Customer Name</th>		   
 				  	<th> Credit Amount </th>
diff --git a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
index 1e26d28f..d2625750 100755
--- a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
@@ -1,9 +1,10 @@
-
+<div class="p-l-15">
+	
 <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
 	<% if period_type != false %>
 		<div class="row">
 			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label>Select Period</label>
+				<label class="font-14">Select Period</label>
 				<select name="period" id="sel_period" class="form-control">
 					<option value="">Select Period</option>
 					<option value="0">Today</option>
@@ -22,14 +23,15 @@
 
 			<div class="col-lg-3 col-md-3 col-sm-3">					
 				<!-- <label class="">Select Shift Period</label> -->
-				<label class="">From</label>
+				<label class="font-14">From</label>
 				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date">
 			</div>
 			<div class="col-lg-3 col-md-3 col-sm-3">
-				<label class="">To</label>
+				<label class="font-14">To</label>
 				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date">
 			</div>
 			<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
+			    <label></label><br>
 				<input type="submit" value="Generate Report" class='btn btn-primary'>
 			</div>							
 		</div>													
@@ -84,7 +86,8 @@
 		</div>
     </div>
 				
-<% end %>		
+<% end %>	
+</div>	
 
 <script type="text/javascript">
 	$(function(){
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index c9adbe47..cc5de623 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -1,33 +1,22 @@
 
 <div class="page-header">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item active">Daily Sale Report</li>
-    <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
-    </span>
-  </ol>
+	<ol class="breadcrumb">
+		<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+		<li class="breadcrumb-item active">Daily Sale Report</li>
+		<span class="float-right">
+			<%= link_to 'Back', dashboard_path %>
+		</span>
+	</ol>
 </div>
 <div class="row">
-	<div class="col-md-12">
+	<div class="col-md-12 col-lg-12 col-sm-12 ">
 
-		<!-- <div class="row">
-			<div class="col-md-12 col-lg-12"> -->
-				<!-- <div class="container"> -->
-				<%= render :partial=>'shift_sale_report_filter',
-				:locals=>{ 	:period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %>
-				<hr />
-				<!-- </div> -->
-		<!-- 	</div>
-		</div> -->
-
-		<!-- <div class="row"> -->
-			<!-- <div class="container"> -->
-			<div class=" text-right">
-				<a href="javascript:export_to('<%=reports_dailysale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
-			</div>	  			
-			<!-- </div> -->
-		<!-- </div> -->
+		<%= render :partial=>'shift_sale_report_filter',
+		:locals=>{ 	:period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %>
+		<hr />
+		<div class=" text-right">
+		<a href="javascript:export_to('<%=reports_dailysale_index_path%>.xls')" class = "btn btn-info wave-effects">Export to Excel</a>
+		</div>	  			
 
 		<div class="row">
 			<div class="col-md-12 col-lg-12">
diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
index c11f98c7..1f5f4e2c 100755
--- a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
@@ -1,50 +1,52 @@
-<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+<div class="p-l-15">
+	<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
 	<% if period_type != false %>
-		<div class="row">
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label>Select Period</label>
-				<select name="period" id="sel_period" class="form-control">
-					<option value="">Select Period</option>
-					<option value="0">Today</option>
-					<option value="1">Yesterday</option>
-					<option value="2">This week</option>
-					<option value="3">Last week</option>
-					<option value="4">Last 7 days</option>
-					<option value="5">This month</option>
-					<option value="6">Last month</option>
-					<option value="7">Last 30 days</option>
-					<option value="8">This year</option>
-					<option value="9">Last year</option>
-				</select>
-			</div>
-			<% if defined? payments %>
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label>Select Payments</label>
-				<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
-			</div>
-			<% end %>
-			<div class="col-lg-2 col-md-2 col-sm-2">					
-				<!-- <label class="">Select Shift Period</label> -->
-				<label class="">From</label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date">
-			</div>
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label class="">To</label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date">
-			</div>
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label class="">All Shift</label>
-				<select class="form-control select" name="shift_name" id="shift_name" >
-				</select>
-			</div>
-			<div class="col-lg-1 col-md-1 col-sm-1 margin-top-20">
+	<div class="row">
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">Select Period</label>
+			<select name="period" id="sel_period" class="form-control">
+				<option value="">Select Period</option>
+				<option value="0">Today</option>
+				<option value="1">Yesterday</option>
+				<option value="2">This week</option>
+				<option value="3">Last week</option>
+				<option value="4">Last 7 days</option>
+				<option value="5">This month</option>
+				<option value="6">Last month</option>
+				<option value="7">Last 30 days</option>
+				<option value="8">This year</option>
+				<option value="9">Last year</option>
+			</select>
+		</div>
+		<% if defined? payments %>
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">Select Payments</label>
+			<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
+		</div>
+		<% end %>
+		<div class="col-lg-2 col-md-2 col-sm-2">					
+			<!-- <label class="">Select Shift Period</label> -->
+			<label class="font-14">From</label>
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+		</div>
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">To</label>
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+		</div>
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">All Shift</label>
+			<select class="form-control select" name="shift_name" id="shift_name" >
+			</select>
+		</div>
+		<div class="col-lg-1 col-md-1 col-sm-1 margin-top-20">
 			<br>
-				<input type="submit" value="Generate Report" class='btn btn-primary'>
-			</div>							
-		</div>													
+			<input type="submit" value="Generate Report" class='btn btn-primary'>
+		</div>							
+	</div>													
 	<% end %>
 
-<% end %>		
+	<% end %>	
+</div>	
 
 <script type="text/javascript">
 	$(function(){
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index 51b66b2d..a526d205 100755
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -19,7 +19,7 @@
 		<!-- <div class="container"> -->
 		<!-- <div class="row"> -->
 			<div class="text-right">
-				<a href="javascript:export_to('<%=reports_receipt_no_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+				<a href="javascript:export_to('<%=reports_receipt_no_index_path%>.xls')" class = "btn btn-info wave-effects">Export to Excel</a>
 			</div>	  			
 		<!-- </div> -->
 		<!-- </div> --> 
@@ -30,14 +30,14 @@
 					<thead>
 
 						<tr>
-							<th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+							<th colspan="9"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
 						</tr>
 						<% if @shift_from %>
 						<tr>
 							<% if @shift_data.employee %>		
 							<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
 							<% end %>			
-							<th colspan="7">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+							<th colspan="9">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
 						</tr>
 						<% end %>	 
 
diff --git a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
index 5436a82e..52ff9036 100755
--- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
@@ -1,130 +1,120 @@
+<div class="p-l-15">
+	<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+	<% if period_type != false %>
+	<div class="row">
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">Select Period</label>
+			<select name="period" id="sel_period" class="form-control">
+				<option value="">Select Period</option>
+				<option value="0">Today</option>
+				<option value="1">Yesterday</option>
+				<option value="2">This week</option>
+				<option value="3">Last week</option>
+				<option value="4">Last 7 days</option>
+				<option value="5">This month</option>
+				<option value="6">Last month</option>
+				<option value="7">Last 30 days</option>
+				<option value="8">This year</option>
+				<option value="9">Last year</option>
+			</select>
+		</div>
+		<!-- <input type="hidden" name="report_type" value="sale_item" id="sel_sale_type"> -->		
+		<div class="col-lg-3 col-md-3 col-sm-3">					
+			<!-- <label class="">Select Shift Period</label> -->
+			<label class="font-14">From</label>
+			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="from" id="from" type="text" placeholder="From date">
+		</div>
+		<div class="col-lg-3 col-md-3 col-sm-3">
+			<label class="font-14">To</label>
+			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="to" id="to" type="text" placeholder="To date">
+		</div>
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">All Shift</label>
+			<select class="form-control select" name="shift_name" id="shift_name" >
+			</select>
+		</div>
+		<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
+			<br>
+			<input type="submit" value="Generate Report" class='btn btn-primary'>
+		</div>							
+	</div>													
+	<% end %>
 
-			<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
-				<% if period_type != false %>
-					<div class="row">
-						<div class="col-lg-2 col-md-2 col-sm-2">
-							<label>Select Period</label>
-							<select name="period" id="sel_period" class="form-control">
-							   <option value="">Select Period</option>
-								<option value="0">Today</option>
-								<option value="1">Yesterday</option>
-								<option value="2">This week</option>
-								<option value="3">Last week</option>
-								<option value="4">Last 7 days</option>
-								<option value="5">This month</option>
-								<option value="6">Last month</option>
-								<option value="7">Last 30 days</option>
-								<option value="8">This year</option>
-								<option value="9">Last year</option>
-							</select>
-						</div>
-						<!-- <input type="hidden" name="report_type" value="sale_item" id="sel_sale_type"> -->
-						<!-- <div class="form-group col-md-2">
-							<label>Select Type</label>
-							<select name="sale_type" id="sel_sale_type" class="form-control">
-								<option value="0">All Sale Type</option>
-								<option value="1">Revenue Only</option>
-								<option value="2">Discount Only</option>
-								<option value="3">Void Only</option>
-								<option value="4">Taxes Only</option>
-								<option value="5">Other Amount Only</option>
-							</select>
-						</div> -->
-						<div class="col-lg-3 col-md-3 col-sm-3">					
-							<!-- <label class="">Select Shift Period</label> -->
-				  			<label class="">From</label>
-							<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
-						</div>
-						<div class="col-lg-3 col-md-3 col-sm-3">
-							<label class="">To</label>
-							<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
-						</div>
-						<div class="col-lg-2 col-md-2 col-sm-2">
-						<label class="">All Shift</label>
-							<select class="form-control select" name="shift_name" id="shift_name" >
-							</select>
-						</div>
-						<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
-						    <br>
-							<input type="submit" value="Generate Report" class='btn btn-primary'>
-						</div>							
-					</div>													
-				<% end %>
-				
-			<% end %>		
+	<% end %>	
+</div>	
 
 <script type="text/javascript">
-$(function(){
-	$('#custom_excel').hide();
-	
-	$('#custom_excel').click(function(){
-		var url = $('#custom_excel').attr('data-url');
-		$('#frm_report').attr('action',url)
-		$('#frm_report').submit();
+	$(function(){
+		$('#custom_excel').hide();
+
+		$('#custom_excel').click(function(){
+			var url = $('#custom_excel').attr('data-url');
+			$('#frm_report').attr('action',url)
+			$('#frm_report').submit();
 		// window.location = url;
 	});
-	
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
-	
-	if(item == 'order'){
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
-		}		
-	}
-	else if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();
-	}
-	else{
-		$('#waiter').hide();
-		$('#cashier').show();		
-		$("#item").val('sale');
-	}
-});
 
- <% if params[:shift_name].to_i > 0%>
+		var item = $('#item').val();
+		var payment_type = $('#payment_type');
+
+		if(item == 'order'){
+			$('#cashier').hide();
+			$('#waiter').show();
+			if(payment_type){
+				$('#payment_type').hide();
+			}		
+		}
+		else if(item == 'sale'){
+			$('#waiter').hide();
+			$('#cashier').show();
+		}
+		else{
+			$('#waiter').hide();
+			$('#cashier').show();		
+			$("#item").val('sale');
+		}
+	});
+
+	<% if params[:shift_name].to_i > 0%>
 	shift_id = '<%= params[:shift_name] %>'
 	local_date = '<%= @shift_from %> - <%= @shift_to %> '
 	var shift = $('#shift_name');
 	str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
 	shift.append(str);
-<% end %>
+	<% end %>
 
- $("#from").val("<%=params[:from] rescue '-'%>");
- $("#to").val("<%=params[:to] rescue '-'%>");
-  $("#sel_period").val(<%=params[:period] rescue '-'%>);
- $("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
+	$("#from").val("<%=params[:from] rescue '-'%>");
+	$("#to").val("<%=params[:to] rescue '-'%>");
+	$("#sel_period").val(<%=params[:period] rescue '-'%>);
+	$("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
 
 
-<% if params[:period_type] == 1 || params[:period_type] == "1" %>
+	<% if params[:period_type] == 1 || params[:period_type] == "1" %>
 	$("#rd_period_type_1").attr("checked","checked");
-<% else %>
+	<% else %>
 	$("#rd_period_type_0").attr("checked","checked");
-<% end %>
-$(".btn-group button").removeClass("active");
-<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
-$("#btn_report_type_<%= report_type %>").addClass("active");
+	<% end %>
+	$(".btn-group button").removeClass("active");
+	<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
+	$("#btn_report_type_<%= report_type %>").addClass("active");
 
-$('#item').change(function(){
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
+	$('#item').change(function(){
+		var item = $('#item').val();
+		var payment_type = $('#payment_type');
 
-	if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();		
-		if(payment_type){
-			$('#payment_type').show();
+		if(item == 'sale'){
+			$('#waiter').hide();
+			$('#cashier').show();		
+			if(payment_type){
+				$('#payment_type').show();
+			}
 		}
-	}
-	else{
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
+		else{
+			$('#cashier').hide();
+			$('#waiter').show();
+			if(payment_type){
+				$('#payment_type').hide();
+			}
 		}
-	}
-});
+	});
 </script>
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index ced2cc17..485ea3ed 100755
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -20,7 +20,7 @@
 		<!-- <div class="container"> -->
 		<!-- <div class="row"> -->
 			<div class="text-right">
-				<a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+				<a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-info wave-effects ">Export to Excel</a>
 			</div>	  			
 		<!-- </div> -->
 		<!-- </div> -->
diff --git a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
index e83183ba..5e44051e 100755
--- a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
@@ -1,44 +1,44 @@
-
-<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
-	<% if period_type != false %>
-		<div class="row">
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label>Select Period</label>
-				<select name="period" id="sel_period" class="form-control">
-					<option value="0">Today</option>
-					<option value="1">Yesterday</option>
-					<option value="2">This week</option>
-					<option value="3">Last week</option>
-					<option value="4">Last 7 days</option>
-					<option value="5">This month</option>
-					<option value="6">Last month</option>
-					<option value="7">Last 30 days</option>
-					<option value="8">This year</option>
-					<option value="9">Last year</option>
-				</select>
-			</div>
-			
-			<div class="col-lg-3 col-md-3 col-sm-3">					
-				<!-- <label class="">Select Shift Period</label> -->
-				<label class="">From</label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date">
-			</div>
-			<div class="col-lg-3 col-md-3 col-sm-3">
-				<label class="">To</label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date">
-			</div>
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label class="">All Shift</label>
-				<select class="form-control select" name="shift_name" id="shift_name" >
-				</select>
-			</div>
-			<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20"><br>
-				<input type="submit" value="Generate Report" class='btn btn-primary'>
-			</div>							
-		</div>													
+<div class="p-l-15">
+	<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+		<% if period_type != false %>
+			<div class="row">
+				<div class="col-lg-2 col-md-2 col-sm-2">
+					<label class="font-14">Select Period</label>
+					<select name="period" id="sel_period" class="form-control">
+						<option value="0">Today</option>
+						<option value="1">Yesterday</option>
+						<option value="2">This week</option>
+						<option value="3">Last week</option>
+						<option value="4">Last 7 days</option>
+						<option value="5">This month</option>
+						<option value="6">Last month</option>
+						<option value="7">Last 30 days</option>
+						<option value="8">This year</option>
+						<option value="9">Last year</option>
+					</select>
+				</div>
+				
+				<div class="col-lg-3 col-md-3 col-sm-3">					
+					<!-- <label class="font-14">Select Shift Period</label> -->
+					<label class="font-14">From</label>
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+				</div>
+				<div class="col-lg-3 col-md-3 col-sm-3">
+					<label class="font-14">To</label>
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+				</div>
+				<div class="col-lg-2 col-md-2 col-sm-2">
+					<label class="font-14">All Shift</label>
+					<select class="form-control select" name="shift_name" id="shift_name" >
+					</select>
+				</div>
+				<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20"><br>
+					<input type="submit" value="Generate Report" class='btn btn-primary'>
+				</div>							
+			</div>													
+		<% end %>
 	<% end %>
-
-<% end %>		
+</div>		
 
 
 <script type="text/javascript">
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb
index 8a3f4339..3b37708a 100755
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -19,7 +19,7 @@
 		<!-- <div class="container"> -->
 			<!-- <div class="row"> -->
 			<div class="text-right">
-					<a href="javascript:export_to('<%=reports_shiftsale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+					<a href="javascript:export_to('<%=reports_shiftsale_index_path%>.xls')" class = "btn btn-info wave-effects">Export to Excel</a>
 				</div>	  			
 			<!-- </div> -->
 		<!-- </div> -->
diff --git a/app/views/reports/stock_check/_stock_check_report_filter.html.erb b/app/views/reports/stock_check/_stock_check_report_filter.html.erb
index 01850483..b7bb304d 100755
--- a/app/views/reports/stock_check/_stock_check_report_filter.html.erb
+++ b/app/views/reports/stock_check/_stock_check_report_filter.html.erb
@@ -1,86 +1,95 @@
-
+<div class="p-l-15">
     <%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
-        <% if period_type != false %>
-            <div class="row">
+    <% if period_type != false %>
+    <div class="row">
 
-              <div class="form-group col-md-3">
+              <!-- <div class="form-group col-md-3">
                 <label class="">Select Date Range</label>
                 <% if @daterange %>
                     <input class="form-control" name="daterange" id="daterange" value="<%= @daterange %>" type="text" placeholder="Date Range" readonly="true">
                 <% else %>
                     <input class="form-control" name="daterange" id="daterange" type="text" placeholder="Date Range" readonly="true">
                 <% end %>
-              </div>
-              <div class="form-group col-md-4">
-                <label class="">Definition Item</label>
+            </div> -->
+            <div class="col-lg-3 col-md-3 col-sm-3">          
+                <!-- <label class="">Select Shift Period</label> -->
+                <label class="font-14">From</label>
+                <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+            </div>
+            <div class="col-lg-3 col-md-3 col-sm-3">
+                <label class="font-14">To</label>
+                <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+            </div>
+            <div class="form-group col-md-4">
+                <label class="font-14">Definition Item</label>
                 <select class="form-control" name="item_code" id="item_code">
                   <option value="">Select Product</option>
                   <% @inventory_definitions.each do |id| %>
-                      <option value="<%= id.item_code %>">
-                        <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
-                        <% if menu_item.nil? %>
-                            <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
-                        <% else %>
-                            <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
-                        <% end %>
-                      </option>
-                  <% end %>
-                </select>
-              </div>
-              <div class="form-group col-md-2 margin-top-20">
-                <input type="submit" value="Generate Report" class='btn btn-primary'>
-              </div>
-              <div class="form-group col-md-2 margin-top-20">
+                  <option value="<%= id.item_code %>">
+                    <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
+                    <% if menu_item.nil? %>
+                    <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
+                    <% else %>
+                    <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
+                    <% end %>
+                </option>
+                <% end %>
+            </select>
+        </div>
+        <div class="form-group col-md-2 margin-top-20"><br>
+            <input type="submit" value="Generate Report" class='btn btn-primary'>
+        </div>
+              <!-- <div class="form-group col-md-2 margin-top-20">
                 <input type="button" value="Clear Filter" id="clear_filter" class='btn btn-danger'>
-              </div>
-            </div>
+            </div> -->
+        </div>
         <% end %>
 
-    <% end %>
-
+        <% end %>
+    </div>
 
 <script type="text/javascript">
 
     $(document).ready(function () {
 
-        $('#item_code').select2({
+       /* $('#item_code').select2({
             placeholder: 'Select Product',
             allowClear: true
-        });
+        });*/
 
-        $('#clear_filter').click(function () {
-            $('#daterange').val('');
-            $('#item_code').val('').text('');
-        });
+        // $('#clear_filter').click(function () {
+        //     $('#daterange').val('');
+        //     $('#item_code').val('').text('');
+        // });
 
-        $('input[name="daterange"]').daterangepicker({
-                autoUpdateInput: false,
-                ranges: {
-                    'Today': [moment(), moment()],
-                    'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
-                    'Last 7 Days': [moment().subtract(6, 'days'), moment()],
-                    'Last 30 Days': [moment().subtract(29, 'days'), moment()],
-                    'This Month': [moment().startOf('month'), moment().endOf('month')],
-                    'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
-                },
-                locale: {
-                    format: 'YYYY-MM-DD'
-                }
-            },
-            function (start, end, label) {
-                $('input[name="daterange"]').val(start.format('YYYY-MM-DD') + ' - ' + end.format('YYYY-MM-DD'));
-            });
+        // $('input[name="daterange"]').daterangepicker({
+        //         autoUpdateInput: false,
+        //         ranges: {
+        //             'Today': [moment(), moment()],
+        //             'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+        //             'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+        //             'Last 30 Days': [moment().subtract(29, 'days'), moment()],
+        //             'This Month': [moment().startOf('month'), moment().endOf('month')],
+        //             'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+        //         },
+        //         locale: {
+        //             format: 'YYYY-MM-DD'
+        //         }
+        //     },
+        //     function (start, end, label) {
+        //         $('input[name="daterange"]').val(start.format('YYYY-MM-DD') + ' - ' + end.format('YYYY-MM-DD'));
+        //     });
 
-        $('input[name="daterange"]').on('apply.daterangepicker', function (ev, picker) {
-            $('input[name="daterange"]').val(picker.startDate.format('YYYY-MM-DD') + ' - ' + picker.endDate.format('YYYY-MM-DD'));
+        // $('input[name="daterange"]').on('apply.daterangepicker', function (ev, picker) {
+        //     $('input[name="daterange"]').val(picker.startDate.format('YYYY-MM-DD') + ' - ' + picker.endDate.format('YYYY-MM-DD'));
 
-            from_date = picker.startDate.format('YYYY-MM-DD 00:00:00');
-            to_date = picker.endDate.format('YYYY-MM-DD 23:59:59');
-        });
+        //     from_date = picker.startDate.format('YYYY-MM-DD 00:00:00');
+        //     to_date = picker.endDate.format('YYYY-MM-DD 23:59:59');
+        // });
 
-        $('input[name="daterange"]').on('cancel.daterangepicker', function (ev, picker) {
-            $('input[name="daterange"]').val('');
-        });
+        // $('input[name="daterange"]').on('cancel.daterangepicker', function (ev, picker) {
+        //     $('input[name="daterange"]').val('');
+        // });
 
     });
 
diff --git a/app/views/reports/stock_check/index.html.erb b/app/views/reports/stock_check/index.html.erb
index 4de80a59..0230e54a 100755
--- a/app/views/reports/stock_check/index.html.erb
+++ b/app/views/reports/stock_check/index.html.erb
@@ -19,7 +19,7 @@
     <!-- <div class="container"> -->
     <!-- <div class="row"> -->
     <div class="text-right">
-      <a href="javascript:export_to('<%= reports_stock_check_index_path %>.xls')" class="btn btn-default">Export to
+      <a href="javascript:export_to('<%= reports_stock_check_index_path %>.xls')" class="btn btn-info wave-effects">Export to
         Excel</a>
       </div>
       <!-- </div> -->
diff --git a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
index f9801429..bdce131e 100755
--- a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
@@ -1,9 +1,9 @@
-
+<div class="p-l-15">
 <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
 	<% if period_type != false %>
 		<div class="row">
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label>Select Period</label>
+			<div class="form-group col-lg-2 col-md-2 col-sm-2">
+				<label class="font-20">Select Period</label>
 				<select name="period" id="sel_period" class="form-control">
 					<option value="">Select Period</option>
 					<option value="0">Today</option>
@@ -19,27 +19,28 @@
 				</select>
 			</div>
 
-			<div class="col-lg-2 col-md-2 col-sm-2">					
+			<div class="form-group col-lg-2 col-md-2 col-sm-2">					
 				<!-- <label class="">Select Shift Period</label> -->
-				<label class="">From</label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date">
+				<label class="font-20">From</label>
+				<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
 			</div>
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label class="">To</label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date">
+			<div class="form-group col-lg-2 col-md-2 col-sm-2">
+				<label class="font-20">To</label>
+				<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
 			</div>
-			<div class="col-lg-3 col-md-3 col-sm-3">
-				<label class="">All Shift</label>
+			<div class="form-group col-lg-3 col-md-3 col-sm-3">
+				<label class="font-20">All Shift</label>
 				<select class="form-control select" name="shift_name" id="shift_name" >
 				</select>
 			</div>
-			<div class="col-lg-1 col-md-1 col-sm-1 margin-top-20">
+			<div class=" col-lg-1 col-md-1 col-sm-1 margin-top-20">
+			<br>
 				<input type="submit" value="Generate Report" class='btn btn-primary'>
 			</div>							
 		</div>													
 	<% end %>
 <% end %>
-
+</div>
 <script type="text/javascript">
 	$(function(){
 		$('#custom_excel').hide();
diff --git a/app/views/settings/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb
index acee9616..be994aa1 100755
--- a/app/views/settings/dining_charges/_form.html.erb
+++ b/app/views/settings/dining_charges/_form.html.erb
@@ -4,42 +4,83 @@
       <%= f.error_notification %>
 
       <div class="form-inputs p-l-15">
-        <%= f.input :item_code, :input_html => { :id => 'item_code' } %>
-        <%= f.input :unit_price, :input_html => { :id => 'unit_price'} %>
-        <%= f.input :taxable %>
-        <%= f.input :charge_type, :collection => [:hr, :day] %>
-        <%= f.input :minimum_free_time %>
-        <%= f.input :charge_block, :input_html => { :id => 'charge_block'} %>
-        <%= f.input :time_rounding, :collection => [:down, :up] %>
-        <%= f.input :time_rounding_block, :input_html => { :id => 'time_rounding_block'} %>
-        <%= f.input :time_rounding_block_price, :input_html => { :id => 'time_rounding_block_price'} %>
+        <%= f.input :item_code, :input_html => { :id => 'item_code',:class=>"col-md-9" } %>
+        <%= f.input :unit_price, :input_html => { :id => 'unit_price',:class=>"col-md-9"} %>
+        <%= f.input :taxable, :input_html => {:class=>"col-md-9"} %>
+        <%= f.input :charge_type, :collection => [:hr, :day], :input_html => {:class=>"col-md-8"} %>
+        <!--<%= f.input :minimum_free_time ,:input_html => { :class => 'timepicker'} %> -->
+            <label class="control-label">* Minimum Free Time</label>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <i class="material-icons">access_time</i>
+              </span>
+                <% if !@dining_charge.minimum_free_time.nil?%>
+                  <input type="text" name="minimum_free_time" value="<%= @dining_charge.minimum_free_time.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Start Time...">
+                <% else %>
+                   <input type="text" name="minimum_free_time" class="timepicker form-control col-md-8" placeholder="Start Time...">
+                <% end %>
+            </div>         
+        <!--<%= f.input :charge_block, :input_html => { :id => 'charge_block'} %>-->
+       <div class="form-group">
+          <label class="control-label required"> Change Block</label>
+          <div class="input-group">
+            <span class="input-group-addon">
+              <i class="material-icons">access_time</i>
+            </span>
+            <% if !@dining_charge.charge_block.nil?%>
+            <input type="text" name="charge_block" value="<%= @dining_charge.charge_block.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Start Time...">
+            <% else %>
+            <input type="text" name="charge_block" class="timepicker form-control col-md-8" placeholder="Start Time...">
+            <% end %>
+          </div> 
+       </div>
+        <%= f.input :time_rounding, :collection => [:down, :up], :input_html => { :class=>"col-md-8"} %>
+       <!-- <%= f.input :time_rounding_block, :input_html => { :id => 'time_rounding_block'} %>-->
+       <div class="form-group">
+         <label class="control-label required"> Time Rounding Block</label>
+          <div class="input-group">
+            <span class="input-group-addon">
+              <i class="material-icons">access_time</i>
+            </span>
+            <% if !@dining_charge.time_rounding_block.nil?%>
+            <input type="text" name="time_rounding_block" value="<%= @dining_charge.time_rounding_block.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Start Time...">
+            <% else %>
+            <input type="text" name="time_rounding_block" class="timepicker form-control col-md-8" placeholder="Start Time...">
+            <% end %>
+          </div> 
+       </div>
+        <%= f.input :time_rounding_block_price, :input_html => { :id => 'time_rounding_block_price',:class=>"col-md-8"} %>
       </div>
 
       <div class="form-actions">
-        <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
+        <%= f.submit "Create",:class => 'btn btn-primary btn-lg waves-effect' %>
       </div>
     <% end %>
   </div>
   <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-        <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
         <p>
-        1) Item code - generated item code for extra charges <br> 
-        2) Unit price - to write price for extra charges <br>
-        3) Taxable - checkbox for taxble or not <br>
-        4) Charge Type - to write type for extra charges <br>
-        5) Minimum free time - time for free <br>
-        6) Charge block - time for block <br>
-        7) Time rounding block - rounding time for block <br>
-        8) Time rounding block price - to write price for time rounding block <br>
+        1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.item_code_txt") %> <%= t("views.right_panel.detail.extra_charges_txt") %> <br> 
+        2) <%= t("views.right_panel.detail.unit_price") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.price_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.extra_charges_txt") %> <br>
+        3) <%= t("views.right_panel.detail.taxable") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.taxable_txt") %> <br>
+        4) <%= t("views.right_panel.detail.charge_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.type_txt") %> <br>
+        5) <%= t("views.right_panel.detail.minimum_free_time") %> - <%= t("views.right_panel.detail.minimum_free_time_txt") %> <br>
+        6) <%= t("views.right_panel.detail.charge_block") %> - <%= t("views.right_panel.detail.charge_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.block_txt") %> <br>
+        7) <%= t("views.right_panel.detail.time_rounding") %> - <%= t("views.right_panel.detail.time_rounding_txt") %> <br>
+        8) <%= t("views.right_panel.detail.time_rounding") %> <%= t("views.right_panel.detail.block_txt") %> - <%= t("views.right_panel.detail.time_rounding_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.block_txt") %> <br>
+        9) <%= t("views.right_panel.detail.time_rounding") %> <%= t("views.right_panel.detail.block_txt") %> <%= t("views.right_panel.detail.price_txt") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.price_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.time_rounding_txt2") %><br>
         </p>
-        <h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
         <p>
-        1) SUBMIT - to create extra charges <br>
+        1) <%= t("views.right_panel.button.create") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.extra_charges_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.detail_txt") %> <br>
         </p>
-        <h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
-        <p>1) Home / Back - go to dashboard</p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/dining_charges/new.html.erb b/app/views/settings/dining_charges/new.html.erb
index ab7009c7..05bb525c 100755
--- a/app/views/settings/dining_charges/new.html.erb
+++ b/app/views/settings/dining_charges/new.html.erb
@@ -1,21 +1,4 @@
-<!-- <h1>New Dining Charge</h1>
 
-<%= render 'form', dining_charge: @dining_charge %> -->
-<!-- <div class="span12">
-		<div class="page-header">
-		 <ul class="breadcrumb">
-		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><a href="<%= settings_zone_path(@zone) %>">Zone</a></li>
-        <% if @table %>
-  			   <li><a href="<%= edit_settings_zone_table_path(@zone,@settings_dining_facility) %>">Table / Room</a></li>
-        <% elsif @room %>
-  			   <li><a href="<%= edit_settings_zone_room_path(@zone,@settings_dining_facility) %>">Table / Room</a></li>
-        <% end %>
-		  	<li>New</li>
-		 </ul>
-		</div>
-    <%= render 'form', dining_charge: @dining_charge %>
-</div> -->
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
diff --git a/app/views/settings/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb
index b1f976ba..1eb6588c 100755
--- a/app/views/settings/item_sets/_form.html.erb
+++ b/app/views/settings/item_sets/_form.html.erb
@@ -20,10 +20,22 @@
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br> 
+        2) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.alt_name_txt") %> <br>
+        3) <%= t("views.right_panel.detail.min_selectable_qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_selectable_qty_txt") %> <br>
+        4) <%= t("views.right_panel.detail.max_selectable_qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.max_selectable_qty_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb
index 2544ae35..15cdbfa2 100755
--- a/app/views/settings/item_sets/index.html.erb
+++ b/app/views/settings/item_sets/index.html.erb
@@ -35,7 +35,7 @@
             <th>Alt Name</th>
             <th>Min selectable qty</th>
             <th>Max selectable qty</th>
-            <th>Action</th>
+            <th>Actions</th>
           </tr>
         </thead>
 
@@ -46,18 +46,8 @@
             <td><%= item.alt_name %></td>
             <td><%= item.min_selectable_qty %></td>
             <td><%= item.max_selectable_qty %></td>
-            <td><%= link_to t("views.btn.show"), settings_item_set_path(item),:class=>'btn btn-sm btn-success waves-effect' %>
+            <td><%= link_to t("views.btn.show"), settings_item_set_path(item),:class=>'btn btn-sm btn-primary waves-effect' %>
               <%= link_to t("views.btn.edit"), edit_settings_item_set_path(item),:class=>'btn btn-sm btn-primary waves-effect' %>
-              
-              <!-- <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_item_set_path(item)%>" data-method="delete">
-                <%= t("views.btn.delete") %>
-              </button>
-
-              <span class="hidden" id="delete_text">
-                <h6>Are you sure you want to delete this row ?</h6>
-                <h6>This action can't be undo. </h6> 
-              </span> -->
-
               </td>
             </tr>
             <% end %>
@@ -69,10 +59,25 @@
     <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
       <div class="card">
         <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-          tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-          quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-          consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+          <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+          <p>
+          1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.item_set_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+          2) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+          3) <%= t("views.right_panel.detail.min_selectable_qty") %> - <%= t("views.right_panel.detail.min_selectable_qty_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+          4) <%= t("views.right_panel.detail.max_selectable_qty") %> - <%= t("views.right_panel.detail.max_selectable_qty_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+          5) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <%= t("views.right_panel.detail.data_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+          <p>
+          1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+          2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+          3) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+          <p>
+            1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+            2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %> <br>
+          </p>
         </div>
       </div>  
     </div>
diff --git a/app/views/settings/item_sets/show.html.erb b/app/views/settings/item_sets/show.html.erb
index bf285f7a..3ec97631 100755
--- a/app/views/settings/item_sets/show.html.erb
+++ b/app/views/settings/item_sets/show.html.erb
@@ -53,10 +53,23 @@
 <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
   <div class="card">
     <div class="body">
-      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+      <p>
+      1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.item_set_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br> 
+      2) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+      3) <%= t("views.right_panel.detail.min_selectable_qty") %> - <%= t("views.right_panel.detail.min_selectable_qty_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+      4) <%= t("views.right_panel.detail.max_selectable_qty") %> - <%= t("views.right_panel.detail.max_selectable_qty_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+      <p>
+      1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+      2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+      <p>
+        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+      </p>
     </div>
   </div>  
 </div>
diff --git a/app/views/settings/menu_categories/_form.html.erb b/app/views/settings/menu_categories/_form.html.erb
index 728f9454..6b45d7ee 100755
--- a/app/views/settings/menu_categories/_form.html.erb
+++ b/app/views/settings/menu_categories/_form.html.erb
@@ -21,10 +21,24 @@
   <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.category_code") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.name_txt2") %><br>
+        3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.alt_name_txt") %><br>
+        4) <%= t("views.right_panel.detail.is_available") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.status_txt") %> <br>
+        5) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+        6) <%= t("views.right_panel.detail.parent") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.parent_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/menu_categories/index.html.erb b/app/views/settings/menu_categories/index.html.erb
index f41862ba..88da26ee 100755
--- a/app/views/settings/menu_categories/index.html.erb
+++ b/app/views/settings/menu_categories/index.html.erb
@@ -56,10 +56,30 @@
 <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
   <div class="card">
     <div class="body">
-      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+      <p>
+      1) <%= t("views.right_panel.detail.menu") %> -  <%= t("views.right_panel.detail.menu_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.menu_txt") %> <br>
+      2) <%= t("views.right_panel.detail.name") %> -  <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+      3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+      4) <%= t("views.right_panel.detail.is_available") %> - <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.status_txt") %><br>
+      5) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+      6) <%= t("views.right_panel.detail.parent") %> - <%= t("views.right_panel.detail.parent_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+      7) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt3") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+      <p>
+      1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+      <p>
+        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+        4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+        5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+        6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+        7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+      </p>
     </div>
   </div>  
 </div>
diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb
index 65bb50e4..c35db563 100755
--- a/app/views/settings/menu_categories/show.html.erb
+++ b/app/views/settings/menu_categories/show.html.erb
@@ -105,7 +105,6 @@
                 <% else %>
                 <td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
                 <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
-                <!-- <%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> -->
                 </td>
                 <% end %>
               </tr>
@@ -119,10 +118,51 @@
   <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
     <div class="card">
       <div class="body">
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <h5><%= t("views.right_panel.header.menu_categories") %></h5>
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.menu") %> - <%= t("views.right_panel.detail.menu_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+        4) <%= t("views.right_panel.detail.is_available") %> - <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.status_txt") %> <br>
+        4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+        5) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+        6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+        </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+      <p>
+      1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+      2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+      </p>
+
+      <h5><%= t("views.right_panel.header.menu_items") %></h5>
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+      <p>
+      1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+      2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_item_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+      3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+      4) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+      5) <%= t("views.right_panel.detail.parent_item") %> - <%= t("views.right_panel.detail.parent_item_txt") %> <br>
+      6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+      <p>
+      1) <%= t("views.right_panel.button.new_simple_menu_item") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.simple_menu_item_txt") %> <br>
+      2) <%= t("views.right_panel.button.new_set_menu_item") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.set_menu_item_txt") %> <br>
+      3) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+      4) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+      </p>
+      -----------------------------------------------------------------
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+      <p>
+        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+        4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+        5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+        6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+        7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+      </p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/menu_item_attributes/_form.html.erb b/app/views/settings/menu_item_attributes/_form.html.erb
index 9c7debf3..75e96501 100755
--- a/app/views/settings/menu_item_attributes/_form.html.erb
+++ b/app/views/settings/menu_item_attributes/_form.html.erb
@@ -17,10 +17,21 @@
 	<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
 		<div class="card">
 			<div class="body">
-				Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-				tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-				quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-				consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+				<h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+		        <p>
+		        1) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.type_txt") %> <br> 
+		        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+		        3) <%= t("views.right_panel.detail.value") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.value_txt") %> <br>
+		        </p>
+		        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+		        <p>
+		        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+		        </p>
+		        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+		        <p>
+		          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+		          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+		        </p>
 			</div>
 		</div>  
 	</div>
diff --git a/app/views/settings/menu_item_attributes/index.html.erb b/app/views/settings/menu_item_attributes/index.html.erb
index 5e42ec4e..1ab7cba9 100755
--- a/app/views/settings/menu_item_attributes/index.html.erb
+++ b/app/views/settings/menu_item_attributes/index.html.erb
@@ -24,7 +24,7 @@
 <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
     <div class="card">
       <div class="card-block">
-        <h4 class="card-title">Menu Category
+        <h4 class="card-title">Menu Item Attributes
     <%= link_to t("views.btn.new"),new_settings_menu_item_attribute_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
     </h4>
     <hr>
@@ -67,10 +67,23 @@
     <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
       <div class="card">
         <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-          tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-          quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-          consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+          <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+          <p>
+          1) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.type_txt") %> / <%= t("views.right_panel.detail.type_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+          2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.item_attributes_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+          3) <%= t("views.right_panel.detail.value") %> - <%= t("views.right_panel.detail.value_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+          4) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt3") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <%= t("views.right_panel.detail.data_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+          <p>
+          1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+          2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+          <p>
+            1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+            2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %> <br>
+          </p>
         </div>
       </div>  
   </div>
diff --git a/app/views/settings/menu_item_attributes/show.html.erb b/app/views/settings/menu_item_attributes/show.html.erb
index 6d735e42..f2308318 100755
--- a/app/views/settings/menu_item_attributes/show.html.erb
+++ b/app/views/settings/menu_item_attributes/show.html.erb
@@ -29,7 +29,7 @@
           <td><%= link_to t("views.btn.edit"), edit_settings_menu_item_attribute_path(@settings_menu_item_attribute, @settings_menu_item_attribute) %>
             <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_menu_item_attribute_path(@settings_menu_item_attribute)%>" data-method="delete">
               <%= t("views.btn.delete") %>
-            </button> -->
+            </button>
             <!-- Start Delete confirrm text !-->
             <span class="hidden" id="delete_text">
                 <h6>Are you sure you want to delete this row ?</h6>
diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb
index 29c09223..7a0de4e6 100755
--- a/app/views/settings/menu_item_instances/_form.html.erb
+++ b/app/views/settings/menu_item_instances/_form.html.erb
@@ -37,10 +37,27 @@
   <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.item_instance_code") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %><br>
+        2) <%= t("views.right_panel.detail.item_instance_name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <%= t("views.right_panel.detail.name_txt2") %><br>
+        3) <%= t("views.right_panel.detail.price") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.price_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %><br>
+        4) <%= t("views.right_panel.detail.item_attributes") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %><br>
+        5) <%= t("views.right_panel.detail.is_on_promotion") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %><br>
+        6) <%= t("views.right_panel.detail.promotion_price") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <%= t("views.right_panel.detail.price_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %><br>
+        7) <%= t("views.right_panel.detail.is_available") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.status_txt") %><br>
+        8) <%= t("views.right_panel.detail.is_default") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.default_txt") %><br>
+        9) <%= t("views.right_panel.detail.item_set") %> - <%= t("views.right_panel.detail.multi_select_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_set_txt") %><br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb
index 9e8b9f6d..aa8cc544 100755
--- a/app/views/settings/menu_item_instances/show.html.erb
+++ b/app/views/settings/menu_item_instances/show.html.erb
@@ -91,10 +91,26 @@
   <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
     <div class="card">
       <div class="body">
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.item_instance_code") %> - <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %><br> 
+        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_item_instance_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        3) <%= t("views.right_panel.detail.price") %> - <%= t("views.right_panel.detail.price_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+        4) <%= t("views.right_panel.detail.is_on_promotion") %> - <%= t("views.right_panel.detail.menu_item_instance_txt") %> <%= t("views.right_panel.detail.is_on_promotion_txt") %> <br>
+        5) <%= t("views.right_panel.detail.promotion_price") %> - <%= t("views.right_panel.detail.promotion_txt") %> <%= t("views.right_panel.detail.price_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+        6) <%= t("views.right_panel.detail.is_available") %> - <%= t("views.right_panel.detail.menu_item_instance_txt") %> <%= t("views.right_panel.detail.status_txt") %> <br>
+        7) <%= t("views.right_panel.detail.is_default") %> - <%= t("views.right_panel.detail.menu_item_instance_txt") %> <%= t("views.right_panel.detail.default_txt") %> <br>
+        8) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+        </p>
+        <!-- <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+        </p> -->
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/menus/_form.html.erb b/app/views/settings/menus/_form.html.erb
index eecc5d76..f7ad95f3 100755
--- a/app/views/settings/menus/_form.html.erb
+++ b/app/views/settings/menus/_form.html.erb
@@ -18,21 +18,24 @@
   </div>
   <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
-       <div class="body">
-        <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
+      <div class="body">
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
         <p>
-        1) Name - to write menu name <br>
-        2) Is active - checkbox for is active or not <br>
-        3) Valid days - to write 1 to 7 /Monday to Friday for these menu <br>
-        4) Valid Time From - limit time from  <br>
-        5) Valid Time To - limit time to  <br>
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.menu_txt") %> <%= t("views.right_panel.detail.name_txt2") %><br>
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %><br>
+        3) <%= t("views.right_panel.detail.valid_days") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.valid_days_txt") %> <br>
+        4) <%= t("views.right_panel.detail.valid_from") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.valid_from_txt") %><br>
+        5) <%= t("views.right_panel.detail.valid_to") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.valid_to_txt") %> <br>
         </p>
-        <h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
         <p>
-        1) SUBMIT - to create menu <br>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.menu_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %> <br>
         </p>
-        <h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
-        <p>1) Home / Back - go to dashboard</p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb
index 0d2cd99e..4d091ae7 100755
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -63,10 +63,29 @@
     <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
       <div class="card">
         <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-          tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-          quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-          consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+          <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+          <p>
+          1) <%= t("views.right_panel.detail.name") %> -  <%= t("views.right_panel.detail.menu_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.menu_txt") %> <br>
+          2) <%= t("views.right_panel.detail.valid_days") %> - <%= t("views.right_panel.detail.valid_days_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+          3) <%= t("views.right_panel.detail.valid_from") %> - <%= t("views.right_panel.detail.valid_from_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+          4) <%= t("views.right_panel.detail.valid_to") %> - <%= t("views.right_panel.detail.valid_to_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+          5) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt3") %> <%= t("views.right_panel.detail.menu_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+          <p>
+          1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.menu_txt") %> <br>
+          2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+          <p>
+            1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+            2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+            3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+            4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+            5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+            6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+            7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+          </p>
         </div>
       </div>  
     </div>
diff --git a/app/views/settings/menus/show.html.erb b/app/views/settings/menus/show.html.erb
index 14f61299..0e2fbf3d 100755
--- a/app/views/settings/menus/show.html.erb
+++ b/app/views/settings/menus/show.html.erb
@@ -103,10 +103,46 @@
 <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
   <div class="card">
     <div class="body">
-      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      <h5><%= t("views.right_panel.header.menu") %></h5>
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_txt") %> <%= t("views.right_panel.detail.name_txt") %> <br>
+        2) <%= t("views.right_panel.detail.valid_days") %> - <%= t("views.right_panel.detail.valid_days_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+        3) <%= t("views.right_panel.detail.valid_from") %> - <%= t("views.right_panel.detail.valid_from_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+        4) <%= t("views.right_panel.detail.valid_to") %> - <%= t("views.right_panel.detail.valid_to_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+        5) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.menu_txt") %> <br>
+        </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+      <p>
+      1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_txt") %> <br>
+      2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.menu_txt") %> <br>
+      </p>
+
+      <h5><%= t("views.right_panel.header.menu_categories") %></h5>
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+      1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.data_txt") %> <br>
+      2) <%= t("views.right_panel.detail.sub_cat_count") %> - <%= t("views.right_panel.detail.number_of") %> <%= t("views.right_panel.detail.sub_categories_txt") %> <br>
+      3) <%= t("views.right_panel.detail.items_count") %> - <%= t("views.right_panel.detail.number_of") %> <%= t("views.right_panel.detail.items") %> <br>
+      4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+      5) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt3") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+      <p>
+      1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+      2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+      </p>
+      -----------------------------------------------------------------
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+      <p>
+        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+        4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+        5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+        6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+        7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+      </p>
     </div>
   </div>  
 </div>
diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index 1c528682..c0c05145 100755
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -6,7 +6,7 @@
   <div class="form-inputs p-l-15">
     <div class="div-border">
         <div class="row">
-          <div class="col-md-6">
+          <div class="col-md-6 form-group">
             <label>*Promo Code</label>
             <div class="input-group"> 
               <span class="input-group-addon">
@@ -18,58 +18,58 @@
         </div>
 
         <div class="row">
-          <div class="col-md-6">
+          <div class="col-md-6 form-group">
             <label>* Start Date</label>
             <div class="input-group">
               <span class="input-group-addon">
                 <i class="material-icons">date_range</i>
               </span>
               <% if !@promotion.promo_start_date.nil?%>
-                <input type="text" name="promotion[promo_start_date]" value="<%= @promotion.promo_start_date.strftime('%A, %d-%m-%Y') %>" class="datepicker form-control" placeholder="Start Date...">
+                <input type="text" name="promotion[promo_start_date]" value="<%= @promotion.promo_start_date.strftime('%A, %d-%m-%Y') %>" class="datepicker form-control col-md-8" placeholder="Start Date...">
               <% else %>
-                 <input type="date" name="promotion[promo_start_date]" class="datepicker form-control" placeholder="Start Date...">
+                 <input type="text" name="promotion[promo_start_date]" class="datepicker form-control col-md-8" placeholder="Start Date...">
               <% end %>
             </div>
           </div>
-          <div class="col-md-6">
+          <div class="col-md-6 form-group">
             <label>* End Date</label>
             <div class="input-group">
               <span class="input-group-addon">
                 <i class="material-icons">date_range</i>
               </span>
               <% if !@promotion.promo_end_date.nil?%>
-                <input type="date" name="promotion[promo_end_date]" value="<%= @promotion.promo_end_date.strftime('%A, %d-%m-%Y') %>" class="datepicker form-control" placeholder="Start Date...">
+                <input type="text" name="promotion[promo_end_date]" value="<%= @promotion.promo_end_date.strftime('%A, %d-%m-%Y') %>" class="datepicker form-control col-md-8" placeholder="Start Date...">
               <% else %>
-                 <input type="date" name="promotion[promo_end_date]" class="datepicker form-control" placeholder="End Date...">
+                 <input type="text" name="promotion[promo_end_date]" class="datepicker form-control col-md-8" placeholder="End Date...">
               <% end %>
             </div>
           </div>
         </div>
 
         <div class="row">
-          <div class="col-md-6">
+          <div class="col-md-6 form-group">
             <label class="control-label">* Start Hour</label>
             <div class="input-group">
               <span class="input-group-addon">
                 <i class="material-icons">access_time</i>
               </span>
                 <% if !@promotion.promo_start_hour.nil?%>
-                  <input type="date" name="promotion[promo_start_hour]" value="<%= @promotion.promo_start_hour.utc.strftime('%H:%M') %>" class="timepicker form-control" placeholder="Start Time...">
+                  <input type="text" name="promotion[promo_start_hour]" value="<%= @promotion.promo_start_hour.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Start Time...">
                 <% else %>
-                   <input type="date" name="promotion[promo_start_hour]" class="timepicker form-control" placeholder="Start Time...">
+                   <input type="text" name="promotion[promo_start_hour]" class="timepicker form-control col-md-8" placeholder="Start Time...">
                 <% end %>
             </div>         
           </div>
-          <div class="col-md-6">
+          <div class="col-md-6 form-group">
             <label class="control-label">* End Hour</label>
             <div class="input-group">
               <span class="input-group-addon">
                 <i class="material-icons">access_time</i>
               </span>
                 <% if !@promotion.promo_end_hour.nil?%>
-                  <input type="text" name="promotion[promo_end_hour]" value="<%= @promotion.promo_end_hour.utc.strftime('%H:%M') %>" class="timepicker form-control" placeholder="End Time...">
+                  <input type="text" name="promotion[promo_end_hour]" value="<%= @promotion.promo_end_hour.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="End Time...">
                 <% else %>
-                   <input type="text" name="promotion[promo_end_hour]" class="timepicker form-control" placeholder="End Time...">
+                   <input type="text" name="promotion[promo_end_hour]" class="timepicker form-control col-md-8" placeholder="End Time...">
                 <% end %>
             </div> 
           <!--  <% if !@promotion.promo_end_hour.nil?%>
@@ -81,8 +81,10 @@
         </div>
 
         <br>
-        <div class="row checkboxes">
-         <div class="col-md-2"><label class="control-label"><abbr title="required">*</abbr>  Promotion Day</label></div>
+        <div class="row checkboxes ">
+         <div class="col-md-2">
+         <label class="control-label font-14"><abbr title="required">*</abbr>  Promotion Day</label>
+         </div>
          <%= f.hidden_field :promo_day, :class => "form-control" %>
           <div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Sunday" value="0" id="0"> Sun</label></div>
           <div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Monday" value="1" id="1">Mon</label></div>
@@ -92,10 +94,9 @@
           <div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Friday" value="5" id="5"> Fri</label></div>
           <div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Saturday" value="6" id="6"> Sat</label></div>
         </div>
-        <br>
 
         <div class="row">
-          <div class="col-md-6">
+          <div class="col-md-5 form-group">
             <select name="promotion[promo_type]" class="form-control">
                 <option>Quantity</option>
                 <option>Net_off</option>
@@ -111,7 +112,7 @@
           <% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
             <% arr.push(p) %>
           <% end %>
-          <div class="col-md-3">
+          <div class="col-md-3 form-group">
             <label class="control-label"><abbr title="required">*</abbr>  Item</label>
             <select class="form-control item_code_place">
               <% if !@promotion.original_product.nil? %>
@@ -142,12 +143,12 @@
               <% sample = Product.where("item_code=?",@promotion.original_product).pluck(:name,:item_code)%>
             <% end %>
           <% end %>
-          <div class="col-md-3"><%= f.input :original_product,collection: sample  %></div>
+          <div class="col-md-3 form-group"><%= f.input :original_product,collection: sample  %></div>
           <!-- <div class="col-md-6"><%= f.input :original_product,collection: MenuItemInstance.order("item_instance_name desc").pluck(:item_instance_name,:item_instance_code),input_html: { selected: 2 } %></div> -->
-          <div class="col-md-6"><%= f.input :min_qty %></div>
+          <div class="col-md-6 form-group"><%= f.input :min_qty %></div>
         </div>
         <br>
-            <div class="" style="border: 1px solid #cccccc;padding:1%">
+            <div class="card">
               <div class="row">
                 <div class="col-md-4" style="text-align:center">Item Code</div>
                 <div class="col-md-2" style="text-align:center">Min Qty</div>
@@ -237,18 +238,18 @@ $(document).ready(function(){
   //   $('#promotion_promo_end_hour').val($('#promotion_promo_end_hour').val().split(":")[0]+":00");
   // });
 
-  $('.datepicker').bootstrapMaterialDatePicker({
-      format: 'dddd DD MM YYYY',
-      clearButton: true,
-      weekStart: 1,
-      time: false
-  });
+  // $('.datepicker').bootstrapMaterialDatePicker({
+  //     format: 'dddd DD MM YYYY',
+  //     clearButton: true,
+  //     weekStart: 1,
+  //     time: false
+  // });
 
-  $('.timepicker').bootstrapMaterialDatePicker({
-      format: 'HH:mm',
-      clearButton: true,
-      date: false
-  });
+  // $('.timepicker').bootstrapMaterialDatePicker({
+  //     format: 'HH:mm',
+  //     clearButton: true,
+  //     date: false
+  // });
 
   // var dayy = $("#promotion_promo_day").val().replace("[","").replace("]","");
   // jQuery.each( dayy.split(","), function( i, d ) {
@@ -283,8 +284,8 @@ $(".selectDay").click(function() {
       document.getElementById("promotion_promo_day").value = day;
   });
 
-  $("#promotion_original_product").select2();
-  $(".item_code_place").select2();
+  // $("#promotion_original_product").select2();
+  // $(".item_code_place").select2();
 
   $(".item_code_place").on('change', function(event) {
     var ajax_url = "<%= settings_find_item_instance_path %>";
@@ -300,19 +301,19 @@ $(".selectDay").click(function() {
               itemlist += "<option value ="+result[i][1]+">"+result[i][0]+"</option>"
             }
             $("#promotion_original_product").append(itemlist);
-            $("#promotion_original_product").select2();
+            //$("#promotion_original_product").select2();
         }
     });
   });
 
-  $(".promotion_promotion_products_item_code select").select2();
-  $(".item_code_place1").select2();
+  //$(".promotion_promotion_products_item_code select").select2();
+  //$(".item_code_place1").select2();
 
   callforpromoproduct();
 
   $(".addProduct").on('click', function(event) {
     setTimeout(function(){
-      $(".promotion_promotion_products_item_code select").select2();
+     // $(".promotion_promotion_products_item_code select").select2();
       callforpromoproduct();
     }, 0);
   });
@@ -332,7 +333,7 @@ $(".selectDay").click(function() {
                   $("select#"+select_id).empty();
                   $("select#"+select_id).append("<option value='"+item_code+"'>"+result[0]+"</option>");
                   $("select#"+select_id).parent().parent().siblings("div.menu_item_choose").find("select").find("option[value='"+result[1]+"']").attr("selected","true")
-                  $("select#"+select_id).parent().parent().siblings("div.menu_item_choose").find("select").select2();
+                 // $("select#"+select_id).parent().parent().siblings("div.menu_item_choose").find("select").select2();
                 }
             }
         });
@@ -340,7 +341,7 @@ $(".selectDay").click(function() {
 
   // promotion_promotion_products_attributes_0_item_code
   function callforpromoproduct(){
-    $(".item_code_place1").select2();
+    //$(".item_code_place1").select2();
     $(".item_code_place1").on('change', function(event) {
       id = $(this).parent().next().find("select").attr("id");
       var ajax_url = "<%= settings_find_item_instance_path	 %>";
@@ -356,7 +357,7 @@ $(".selectDay").click(function() {
                 itemlist += "<option value ="+result[i][1]+">"+result[i][0]+"</option>"
               }
               $("select#"+id).append(itemlist);
-              $("select#"+id).select2();
+              //$("select#"+id).select2();
           }
       });
     });
diff --git a/app/views/settings/rooms/_form.html.erb b/app/views/settings/rooms/_form.html.erb
index 209ae5c8..b2b0ce8c 100755
--- a/app/views/settings/rooms/_form.html.erb
+++ b/app/views/settings/rooms/_form.html.erb
@@ -1,5 +1,3 @@
-
-
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings,@zone,@settings_room]) do |f| %>
@@ -13,24 +11,44 @@
       <%= f.input :is_active %>
       <% if @settings_room.dining_charges.length == 0 %>
        <% if @settings_room.id != nil %>
-          <div class="div-border">
-                <div class="col-md-10">
-                    <%= link_to 'Add For Extra Charges', new_settings_zone_room_dining_charge_path(@zone,@settings_room),:class => 'btn btn-primary' %>
+          <div class="">
+                <div class="">
+                    <%= link_to 'Add For Extra Charges', new_settings_zone_room_dining_charge_path(@zone,@settings_room),:class => 'btn bg-deep-purple' %>
                 </div>
           </div>
         <% end %>
       <% else %>
         <%  @settings_room.dining_charges.each do |dc| %>
-        <div class="div-border">
-              <div class="col-md-10"><b><u>Dining Charge</u></b></div>
-              <div class="col-md-10">item code   :  <%= dc.item_code %></div>
-              <div class="col-md-10">Unit price  :  <%= dc.unit_price %></div>
-              <div class="col-md-10">Charge type :  <%= dc.charge_type %></div>
-              <div class="col-md-10">
-                <%= link_to 'Edit Charges', edit_settings_zone_room_dining_charge_path(@zone,@settings_room,dc),:class => 'btn btn-primary' %>
+        
+        <div class="card">
+            <div class="col-md-7">
+              <table class="table">
+                <tr><td colspan="2">
+                  <div class="col-md-10"><b><u>Dining Charge</u></b></div></td>
+                </tr>
+                <tr>
+                  <td>Item code :</td>
+                  <td><%= dc.item_code %></td>
+                </tr>
+                <tr>
+                  <td>Unit price : </td>
+                  <td><%= dc.unit_price %></td>
+                </tr>
+                <tr>
+                  <td>Charge type : </td>
+                  <td><%= dc.charge_type %></td>
+                </tr>
+                <tr>
+                  <td>
+                       <%= link_to 'Edit Charges', edit_settings_zone_room_dining_charge_path(@zone,@settings_room,dc),:class => 'btn bg-deep-purple' %>
                 <!-- <button class="btn btn-primary" src="<%= edit_settings_zone_room_dining_charge_path(@zone,@settings_room,dc) %>">Edit Charge</button> -->
+                      
+                    </td>
+                    <td></td>
+                  </tr>
+                </table>
               </div>
-        </div>
+          </div>
         <% end %>
       <% end %>
     </div>
@@ -43,10 +61,23 @@
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.room_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br> 
+        2) <%= t("views.right_panel.detail.status") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.status_txt") %> <br>
+        3) <%= t("views.right_panel.detail.seater") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.seat_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        5) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.create") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.detail_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb
index bdb0d6ea..a0f6ab39 100755
--- a/app/views/settings/set_menu_items/_form.html.erb
+++ b/app/views/settings/set_menu_items/_form.html.erb
@@ -1,68 +1,91 @@
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
     <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %>
     <%= f.error_notification %>
+    <div class="row">
+      <div class="col-md-6">
+        <div class="p-l-20">
+          <%= f.input :item_code,:input_html => {:class => "col-md-9"} %>
+          <%= f.input :name,:input_html => {:class => "col-md-9"} %>
+          <%= f.input :alt_name,:input_html => {:class => "col-md-9"} %>
+          <%= f.input :type,:input_html => {:class => "col-md-9"} %>
+          <%= f.input :min_qty,:input_html => {:class => "col-md-9"} %>
+          <%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"} %> 
 
-    <div class="col-md- panel">
-      <div class="form-group p-l-15">
-      <div class="col-md-">
-          <%= f.input :item_code %>
-          <%= f.input :name %>
-          <%= f.input :alt_name %>
-          <%= f.input :type %>
-          <%= f.input :min_qty %>
-          <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> 
-        </div>    
-        <div class="col-md-">
-          <%= f.input :is_available, :class => "form-control" %> 
+          <%= f.input :is_available,:input_html => {:class => "col-md-9"} %> 
 
-          <%= f.input :is_sub_item, :class => "form-control" %>
+          <%= f.input :is_sub_item,:input_html => {:class => "col-md-9"} %>
 
-          <%= f.input :unit, :collection => Lookup.collection_of("unit") ,:class => "form-control" %>
+          <%= f.input :unit, :collection => Lookup.collection_of("unit") ,:input_html => {:class => "col-md-9"} %>
+        </div>
+      </div>        
 
-          <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true },  :class => "form-control item_attributes" %>
 
-          <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true },  :class => "form-control item_options" %>
-        </div>        
-      </div>
-    </div>
+      <div class="col-md-6">
 
-    <div class="col-md-">
-      <div class="panel padding-10">
-        <div class="form-group">
-          <div class="menu-item-img">
-            <% if f.object.image_path? %>
-            <p><%= f.object.name %></p>
-            <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
-            <% else %>
-            <p>Menu Item Image</p>
-            <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
-            <% end %>          
+        <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true,:class => "form-control item_attributes col-md-9" } %>
+
+        <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true,:class => "form-control item_options col-md-9" } %>
+
+        <div class="panel padding-10">
+          <div class="form-group">
+            <div class="menu-item-img">
+              <% if f.object.image_path? %>
+              <p><%= f.object.name %></p>
+              <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
+              <% else %>
+              <p>Menu Item Image</p>
+              <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
+              <% end %>          
+            </div>
+            <%= f.file_field :image_path, :class => "img-thumbnail" %>
           </div>
-          <%= f.file_field :image_path, :class => "img-thumbnail" %>
         </div>
-      </div>
 
-      <div class="panel padding-10">
-        <div class="form-group">
-          <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true },  :class => "form-control item_sets" %>
+        <div class="panel padding-10">
+          <div class="form-group">
+            <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true },  :class => "form-control item_sets" %>
+          </div>
         </div>
-      </div>
 
-      <div class="form-actions p-l-15">
-        <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
+        <div class="form-actions p-l-15">
+          <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
+        </div>
       </div>
     </div>
     <% end %>
   </div>
-  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
     <div class="card">
       <div class="body">
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.set_menu_item_txt") %><br>
+        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.set_menu_item_txt") %> <%= t("views.right_panel.detail.name_txt2") %><br>
+        3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.alt_name_txt") %><br>
+        4) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.set_menu_item_txt") %> <br>
+        5) <%= t("views.right_panel.detail.min_qty") %> - <%= t("views.right_panel.detail.min_qty_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.set_menu_item_txt") %><br>
+        6) <%= t("views.right_panel.detail.account_type") %> - <%= t("views.right_panel.detail.account_type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.set_menu_item_txt") %><br>
+        7) <%= t("views.right_panel.detail.is_available") %> - <%= t("views.right_panel.detail.set_menu_item_txt") %> <%= t("views.right_panel.detail.status_txt") %><br>
+        8) <%= t("views.right_panel.detail.is_sub_item") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.sub_item_txt") %> <br>
+        9) <%= t("views.right_panel.detail.unit") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.unit_txt") %> <br>
+        10) <%= t("views.right_panel.detail.item_attributes") %> - <%= t("views.right_panel.detail.multi_select_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_attributes_txt") %><br>
+        11) <%= t("views.right_panel.detail.item_options") %> - <%= t("views.right_panel.detail.multi_select_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_options_txt") %><br>
+        12) <%= t("views.right_panel.detail.menu_item_image") %> - <%= t("views.right_panel.detail.upload_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.set_menu_item_txt") %> <%= t("views.right_panel.detail.image_txt") %><br>
+        13) <%= t("views.right_panel.detail.item_sets") %> - <%= t("views.right_panel.detail.multi_select_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_set_txt") %><br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.set_menu_item_txt") %> <br>
+        2) <%= t("views.right_panel.button.pick_image") %> - <%= t("views.right_panel.detail.image_btn_txt") %> <%= t("views.right_panel.detail.image_txt") %> <br>
+        3) <%= t("views.right_panel.button.cancel") %> - <%= t("views.right_panel.detail.cancel_btn_txt") %> <%= t("views.right_panel.detail.image_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.set_menu_item_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/set_menu_items/index.html.erb b/app/views/settings/set_menu_items/index.html.erb
index f941bc13..a8008306 100755
--- a/app/views/settings/set_menu_items/index.html.erb
+++ b/app/views/settings/set_menu_items/index.html.erb
@@ -105,11 +105,11 @@
             <% if settings_menu_item.type == "SimpleMenuItem" %>
               <td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
                 <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
-                <%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } ,:class => 'btn btn-danger btn-sm waves-effect'%></td>
+              <!--  <%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } ,:class => 'btn btn-danger btn-sm waves-effect'%>--></td>
               <% else %>
               <td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
                 <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
-                <%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td>
+              <!--  <%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %>--></td>
                 <% end %>
               </tr>
               <% end %>
diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb
index 723e65f5..cf111bf8 100755
--- a/app/views/settings/simple_menu_items/_form.html.erb
+++ b/app/views/settings/simple_menu_items/_form.html.erb
@@ -1,68 +1,81 @@
 
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
-      <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %>
-  <%= f.error_notification %>
+    <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %>
+    <%= f.error_notification %>
+       <div class="row">
+         <div class="col-md-6 panel">
+            <div class="form- p-l-20">
+              <%= f.input :item_code,:input_html => {:class => "col-md-9"} %>
+              <%= f.input :name,:input_html => {:class => "col-md-9"} %>
+              <%= f.input :alt_name,:input_html => {:class => "col-md-9"} %>
+              <%= f.input :type,:input_html => {:class => "col-md-9"} %>
+              <%= f.input :min_qty,:input_html => {:class => "col-md-9"} %>
+              <%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"} %> 
+              
+              <%= f.input :is_available,:input_html => {:class => "col-md-9"} %> 
 
-  <div class="col-md- panel">
-    <div class="form-group">
-      <div class="col-md-">
-        <%= f.input :item_code %>
-        <%= f.input :name %>
-        <%= f.input :alt_name %>
-        <%= f.input :type %>
-        <%= f.input :min_qty %>
-        <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> 
-      </div>    
-      <div class="col-md-">
-        <%= f.input :is_available, :class => "form-control" %> 
+              <%= f.input :is_sub_item,:input_html => {:class => "col-md-9"} %>
 
-        <%= f.input :is_sub_item, :class => "form-control" %>
+              <%= f.input :unit, :collection => Lookup.collection_of("unit") ,:input_html => {:class => "col-md-9"} %>
+            </div>
+          </div>
 
-        <%= f.input :unit, :collection => Lookup.collection_of("unit") ,:class => "form-control" %>
+          <div class="col-md-6">
+                <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true,:class => "col-md-9 item_attributes" } %>
 
-        <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true },  :class => "form-control item_attributes" %>
+                <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true,:class => "col-md-9" } %>
 
-        <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true },  :class => "form-control item_options" %>
-      </div>        
-    </div>
+                <div class="menu-item-img">
+                  <% if f.object.image_path? %>
+                  <p><%= f.object.name %></p>
+                  <%= image_tag f.object.image_path.url,:input_html => { :class => "col-md-4 img-thumbnail" } %>
+                  <% else %>
+                  <p>Menu Item Image</p>
+                  <%= image_tag "/image/menu_images/default.png",:input_html => { :class => "col-md-4 img-thumbnail" } %>
+                  <% end %>          
+                </div>
+                <%= f.file_field :image_path,:input_html => { :class => "col-md-4 img-thumbnail" } %>
+
+                <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true,:class => "form-control item_sets col-md-9" } %>
+
+            <div class="form-actions">
+              <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
+            </div>
+          </div>
+       </div>
+    <% end %>
   </div>
-
-  <div class="col-md-">
-    <div class="panel padding-10">
-      <div class="form-group">
-        <div class="menu-item-img">
-          <% if f.object.image_path? %>
-            <p><%= f.object.name %></p>
-            <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
-          <% else %>
-            <p>Menu Item Image</p>
-            <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
-          <% end %>          
-        </div>
-        <%= f.file_field :image_path, :class => "img-thumbnail" %>
-      </div>
-    </div>
-
-    <div class="panel padding-10">
-      <div class="form-group">
-        <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true },  :class => "form-control item_sets" %>
-      </div>
-    </div>
-
-    <div class="form-actions">
-      <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
-    </div>
-  </div>
-<% end %>
-    </div>
- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
     <div class="card">
       <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.simple_menu_item_txt") %><br>
+        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.simple_menu_item_txt") %> <%= t("views.right_panel.detail.name_txt2") %><br>
+        3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.alt_name_txt") %><br>
+        4) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.simple_menu_item_txt") %> <br>
+        5) <%= t("views.right_panel.detail.min_qty") %> - <%= t("views.right_panel.detail.min_qty_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.simple_menu_item_txt") %><br>
+        6) <%= t("views.right_panel.detail.account_type") %> - <%= t("views.right_panel.detail.account_type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.simple_menu_item_txt") %><br>
+        7) <%= t("views.right_panel.detail.is_available") %> - <%= t("views.right_panel.detail.simple_menu_item_txt") %> <%= t("views.right_panel.detail.status_txt") %><br>
+        8) <%= t("views.right_panel.detail.is_sub_item") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.sub_item_txt") %> <br>
+        9) <%= t("views.right_panel.detail.unit") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.unit_txt") %> <br>
+        10) <%= t("views.right_panel.detail.item_attributes") %> - <%= t("views.right_panel.detail.multi_select_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_attributes_txt") %><br>
+        11) <%= t("views.right_panel.detail.item_options") %> - <%= t("views.right_panel.detail.multi_select_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_options_txt") %><br>
+        12) <%= t("views.right_panel.detail.menu_item_image") %> - <%= t("views.right_panel.detail.upload_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.simple_menu_item_txt") %> <%= t("views.right_panel.detail.image_txt") %><br>
+        13) <%= t("views.right_panel.detail.item_sets") %> - <%= t("views.right_panel.detail.multi_select_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_set_txt") %><br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.simple_menu_item_txt") %> <br>
+        2) <%= t("views.right_panel.button.pick_image") %> - <%= t("views.right_panel.detail.image_btn_txt") %> <%= t("views.right_panel.detail.image_txt") %> <br>
+        3) <%= t("views.right_panel.button.cancel") %> - <%= t("views.right_panel.detail.cancel_btn_txt") %> <%= t("views.right_panel.detail.image_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.simple_menu_item_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb
index a30d3b6c..beb32ddf 100755
--- a/app/views/settings/simple_menu_items/show.html.erb
+++ b/app/views/settings/simple_menu_items/show.html.erb
@@ -35,7 +35,7 @@
             <th>Name</th>
             <!-- <th>Alt name</th> -->
             <th>Type</th>
-            <th>Accout</th>
+            <th>Account</th>
            <!--  <th>Menu category</th> -->
             <!-- <th>Menu item</th> -->
             <!-- <th>Min qty</th> -->
@@ -126,10 +126,49 @@
 <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
   <div class="card">
     <div class="body">
-      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      <h5><%= t("views.right_panel.header.menu_items") %></h5>
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+      <p>
+      1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+      2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_item_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+      3) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+      4) <%= t("views.right_panel.detail.account") %> - <%= t("views.right_panel.detail.account_type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+      5) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+      6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+      <p>
+      1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+      2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+      </p>
+
+      <h5><%= t("views.right_panel.header.menu_item_instances") %></h5>
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.instance_code") %> - <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+        2) <%= t("views.right_panel.detail.instance_name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+        3) <%= t("views.right_panel.detail.item_attributes") %> - <%= t("views.right_panel.detail.item_attributes_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %><br>
+        4) <%= t("views.right_panel.detail.price") %> - <%= t("views.right_panel.detail.price_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+        4) <%= t("views.right_panel.detail.promotion") %> - <%= t("views.right_panel.detail.promotion_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+        5) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+        </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+      <p>
+      1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+      2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+      3) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+      </p>
+      -----------------------------------------------------------------
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+      <p>
+        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+        4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+        5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+        6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+        7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+      </p>
     </div>
   </div>  
 </div>
diff --git a/app/views/settings/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb
index 682df12d..51c227cb 100755
--- a/app/views/settings/tables/_form.html.erb
+++ b/app/views/settings/tables/_form.html.erb
@@ -11,29 +11,43 @@
         <%= f.input :is_active %>
         <% if @settings_table.dining_charges.length == 0 %>
           <% if @settings_table.id != nil %>
-            <div class="div-border">
-                  <div class="col-md-10">
-                      <%= link_to 'Add For Extra Charges', new_settings_zone_table_dining_charge_path(@zone,@settings_table),:class => 'btn btn-primary' %>
+                  <div class="col-md-">
+                      <%= link_to 'Add For Extra Charges', new_settings_zone_table_dining_charge_path(@zone,@settings_table),:class => 'btn bg-deep-purple' %>
                   </div>
-            </div>
           <% end %>
         <% else %>
           <%  @settings_table.dining_charges.each do |dc| %>
-          <div class="div-border">
-                <div class="col-md-10"><b><u>Dining Charge</u></b></div>
-                <div class="col-md-10">item code   :  <%= dc.item_code %></div>
-                <div class="col-md-10">Unit price  :  <%= dc.unit_price %></div>
-                <div class="col-md-10">Charge type :  <%= dc.charge_type %></div>
-                <div class="col-md-10">
-                  <%= link_to 'Edit Charges', edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc),:class => 'btn btn-primary' %>
-                  <!-- <button class="btn btn-primary" src="<%= edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc) %>">Edit Charge</button> -->
-                </div>
+          <div class="card">
+            <div class="">
+              <table class="table">
+                <tr><td colspan="2">
+                  <div class="col-md-10"><b><u>Dining Charge</u></b></div></td>
+                </tr>
+                <tr>
+                  <td>Item code :</td>
+                  <td><%= dc.item_code %></td>
+                </tr>
+                <tr>
+                  <td>Unit price : </td>
+                  <td><%= dc.unit_price %></td>
+                </tr>
+                <tr>
+                  <td>Charge type : </td>
+                  <td><%= dc.charge_type %></td>
+                </tr>
+                <tr>
+                  <td><%= link_to 'Edit Charges', edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc),:class => 'btn bg-deep-purple' %>
+                    <!-- <button class="btn btn-primary" src="<%= edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc) %>">Edit Charge</button> --></td>
+                    <td></td>
+                  </tr>
+                </table>
+              </div>
           </div>
           <% end %>
         <% end %>
       </div>
 
-      <div class="form-actions">
+      <div class="form-actions p-l-15">
          <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
       </div>
     <% end %>
@@ -41,21 +55,24 @@
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-        <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
         <p>
-        1) Name - to write table name <br> 
-        2) Status - to write is available or not <br>
-        3) Seater - to write seat for table <br>
-        4) Order by - to write order for table <br>
-        5) Is active - checkbox for is active or not <br>
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.table_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br> 
+        2) <%= t("views.right_panel.detail.status") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.status_txt") %> <br>
+        3) <%= t("views.right_panel.detail.seater") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.seat_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        5) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
         </p>
-        <h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
         <p>
-        1) ADD FOR EXTRA CHARGES - to add for extra charges <br>
-        2) CREATE - to create table <br>
+        1) <%= t("views.right_panel.button.add_extra_charges") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.extra_charges_txt") %> <br>
+        2) <%= t("views.right_panel.button.create") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
         </p>
-        <h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
-        <p>1) Home / Back - go to dashboard</p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/tables/show.html.erb b/app/views/settings/tables/show.html.erb
index 863ab04c..00edd68d 100755
--- a/app/views/settings/tables/show.html.erb
+++ b/app/views/settings/tables/show.html.erb
@@ -65,24 +65,27 @@
   <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
     <div class="card">
       <div class="body">
-        <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
         <p>
-        1) Name - table name <br> 
-        2) Status - table is available or not <br>
-        3) Seater - seat for table <br>
-        4) Order by - order for table <br>
-        5) Is active - is active or not <br>
-        6) Created By - user who created table <br>
-        7) Created At - datetime for table <br>
-        8) Actions - user can edit/delete table <br>
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.table_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.table_txt") %><br> 
+        2) <%= t("views.right_panel.detail.status") %> - <%= t("views.right_panel.detail.table_txt") %> <%= t("views.right_panel.detail.status_txt") %> <br>
+        3) <%= t("views.right_panel.detail.seater") %> - <%= t("views.right_panel.detail.seat_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        5) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.table_txt") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        6) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        7) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        8) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.table_txt") %> <br>
         </p>
-        <h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
         <p>
-        1) EDIT - to edit table <br>
-        2) DELETE - to delete table <br>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
         </p>
-        <h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
-        <p>1) Home / Back - go to dashboard</p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/zones/_form.html.erb b/app/views/settings/zones/_form.html.erb
index f6f427d8..66bf6381 100755
--- a/app/views/settings/zones/_form.html.erb
+++ b/app/views/settings/zones/_form.html.erb
@@ -17,17 +17,20 @@
  <div class="col-xs-12 col-sm-12 col-md-5 col-lg-5">
     <div class="card">
       <div class="body">
-        <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
         <p>
-        1) Name - to write zone name <br>
-        2) Is active - checkbox for is active or not <br>
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
         </p>
-        <h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
         <p>
-        1) CREATE ZONE - to create zone <br>
+        1) <%= t("views.right_panel.button.create") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.detail_txt") %> <br>
         </p>
-        <h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
-        <p>1) Home / Back - go to dashboard</p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/zones/index.html.erb b/app/views/settings/zones/index.html.erb
index 554b9dc6..63b2deeb 100755
--- a/app/views/settings/zones/index.html.erb
+++ b/app/views/settings/zones/index.html.erb
@@ -48,20 +48,24 @@
   <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
     <div class="card">
       <div class="body">
-        <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
         <p>
-        1) Name - zone name <br>
-        2) Is active - is active or not <br>
-        3) Created by - user who created zone <br>
-        4) Actions - user can view/change zone data <br>
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.data_txt") %> <br>
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        3) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.created_by_txt") %> <br>
+        4) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.data_txt") %> <br>
         </p>
-        <h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
         <p>
-        1) EDIT - to edit zone <br>
-        2) DELETE - to delete zone <br>
+        1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
+        2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
+        3) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
         </p>
-        <h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
-        <p>1) Home / Back - go to dashboard</p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/zones/show.html.erb b/app/views/settings/zones/show.html.erb
index 9a431987..04446f95 100755
--- a/app/views/settings/zones/show.html.erb
+++ b/app/views/settings/zones/show.html.erb
@@ -112,41 +112,43 @@
 <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
   <div class="card">
     <div class="body">
-      <h5>Zone</h5>
-      <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
+      <h5><%= t("views.right_panel.header.zone") %></h5>
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
         <p>
-      1) Name - zone name <br>
-      2) Is active - is active or not <br>
-      3) Created by - user who created zone <br>
-      4) Actions - user can change/delete zone data <br>
-      </p>
-      <h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        3) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
+        4) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
+        </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
       <p>
-      1) NEW - to add new zone <br>
-      2) SHOW - to show zone detail <br>
-      3) EDIT - to edit zone <br>
+      1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
+      2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
       </p>
 
-      <h5>Dining Facilities</h5>
-      <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
+      <h5><%= t("views.right_panel.header.dining_facilities") %></h5>
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
         <p>
-      1) Name - table name / user can view table data<br>
-      2) Type - type for table <br>
-      3) Seater - seat for table <br>
-      4) Is active - is active or not <br>
-      5) Created by - user who created table <br>
-      6) Created At - datetime for created table <br>
-      7) Actions - user can change table data <br>
+      1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.table_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.table_txt") %> <%= t("views.right_panel.detail.data_txt") %><br>
+      2) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+      3) <%= t("views.right_panel.detail.seater") %> - <%= t("views.right_panel.detail.seat_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+      4) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.is_active_txt") %> <br>
+      5) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+      6) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+      7) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt3") %> <%= t("views.right_panel.detail.table_txt") %> <br>
       </p>
-      <h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
       <p>
-      1) NEW TABLE - to add new table <br>
-      2) NEW ROOM - to add new room <br>
-      3) EDIT - to edit table <br>
+      1) <%= t("views.right_panel.button.new_table") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+      2) <%= t("views.right_panel.button.new_room") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+      3) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
       </p>
       -----------------------------------------------------------------
-      <h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
-      <p>1) Home / Back - go to dashboard</p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+      <p>
+        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
+      </p>
     </div>
   </div>  
 </div>
diff --git a/app/views/transactions/credit_notes/index.html.erb b/app/views/transactions/credit_notes/index.html.erb
index 451b4eb3..3250fd2d 100755
--- a/app/views/transactions/credit_notes/index.html.erb
+++ b/app/views/transactions/credit_notes/index.html.erb
@@ -1,4 +1,4 @@
-<div class="row">
+<!-- <div class="row">
   <div class="col-lg-12">
     <ol class="breadcrumb">
        <li><a href="<%= crm_root_path %>">Home</a></li>
@@ -8,44 +8,54 @@
        
     </ol>
   </div>
+</div> -->
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item active">Credit Note</li>
+    <span class="float-right">
+      <%= link_to 'Back', dashboard_path %>
+    </span>
+  </ol>
 </div>
-
 <div class="row">
   <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
       <div class="main-box-body clearfix p-l-5 p-r-5">
         <div class="table-responsive">
           <table class="table table-">
-            <theadtbody>
+            <tbody>
                <tr>
                  <td colspan="">
                     <%= form_tag transactions_credit_notes_path, :method => :get do %>
-                       <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
-                         <label>Enter Keywords</label>
-                         <input type="text" name="receipt_no" class="form-control" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px">
+                       <div class="row clearfix">
+                         <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+                           <label class="font-14">Enter Keywords</label>
+                           <input type="text" name="receipt_no" class="form-control m-t-3" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px">
+                         </div>
+                         <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+                          <label class="font-14">Select Customer</label>
+                           <select class="selectpicker form-control col-md-12 " name="customer"  style="height: 40px" >
+                            <option value="">Select Customer</option>
+                              <%  @customers.each do |customer| %>
+                                 <option value="<%= customer.customer_id %>">
+                                <%= customer.name %></option>
+                              <%end %>
+                            </select>   
+                        </div>
+                         <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+                           <label class="font-14">From</label>
+                           <input class="form-control datepicker m-t-3" name="from" id="date" type="text" placeholder="From date">
+                        </div>
+                        <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+                          <label class="font-14">To</label>
+                          <input class="form-control datepicker m-t-3" name="to" id="date" type="text" placeholder="To date">
+                        </div>
+                        
+                        <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
+                          <label class="font-14"> &nbsp;</label><br>
+                          <input type="submit" value="Search" class='btn btn-primary btn-md'>
+                        </div>
                        </div>
-                       <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-                        <label>Select Customer</label>
-                         <select class="selectpicker form-control col-md-12" name="customer"  style="height: 40px" >
-                          <option value="">Select Customer</option>
-                            <%  @customers.each do |customer| %>
-                               <option value="<%= customer.customer_id %>">
-                              <%= customer.name %></option>
-                            <%end %>
-                          </select>   
-                      </div>
-                       <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-                         <label class="">From</label>
-                         <input class="form-control datepicker" name="from" id="date" type="text" placeholder="From date">
-                      </div>
-                      <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-                        <label class="">To</label>
-                        <input class="form-control datepicker" name="to" id="date" type="text" placeholder="To date">
-                      </div>
-                      
-                     <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
-                        <label> &nbsp;</label>
-                        <input type="submit" value="Search" class='btn btn-primary btn-md'>
-                      </div>
                     <% end %>
                   </td>
                </tr>
diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb
index f918e7b6..6a534715 100755
--- a/app/views/transactions/sales/index.html.erb
+++ b/app/views/transactions/sales/index.html.erb
@@ -34,7 +34,7 @@
                         <label></label>
                         <br><input type="submit" value="Search" class='btn btn-primary btn-md'>
                       </div>
-                      </div>
+                    </div>
                     <% end %>
                  </td>
               </tr>
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb
index 13ecd291..4aa9a4b8 100755
--- a/app/views/transactions/sales/show.html.erb
+++ b/app/views/transactions/sales/show.html.erb
@@ -36,9 +36,7 @@
                 <div class="table-responsive">
                     <table class="table table-striped">
                       <thead>
-                        <tr>
-                          <td colspan="6">&nbsp;</td>
-                        </tr>
+                       
                         <tr>
                           <th>Receipt Date </th>
                           <th>Receipt no</th>
@@ -129,9 +127,6 @@
                 <div class="table-responsive">
                     <table class="table table-striped">
                       <thead>
-                        <tr>
-                          <td colspan="8">&nbsp;</td>
-                        </tr>
                         <tr>
                           <th>Order ID</th>
                           <th>Menu Item</th>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 56843505..d4d9fd3e 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -20,6 +20,8 @@ en:
   staff: "Staff"
   products: "Products"
   promotions: "Promotions"
+  commissions: "Commissions"
+  commissioners: "Commissioners"
   printer: "Printer"
   logout: "Logout"
   sale: "Sale"
@@ -36,7 +38,7 @@ en:
   category: "Category"
   processed: "Processed"
   competed: "Completed"
-  tax_profile: "Tad Profile"
+  tax_profile: "Tax Profile"
   payment_methods: "Payment Methods"
   accounts: "Accounts"
 
@@ -100,6 +102,165 @@ en:
       previous: "&lsaquo; Prev"
       next: "Next &rsaquo;"
       truncate: "&hellip;"
+
+    right_panel:
+      header:
+        page_detail: "PAGE DETAIL"
+        button_lists: "BUTTON LISTS"
+        link_lists: "LINK LISTS"
+        zone: "Zone"
+        dining_facilities: "Dining Facilities"
+        menu: "Menu"
+        menu_categories: "Menu Categories"
+        menu_items: "Menu Items"
+        menu_item_instances: "Menu Item Instances"
+      button:
+        new: "NEW"
+        create: "CREATE"
+        show: "SHOW"
+        edit: "EDIT"
+        delete: "DELETE"
+        new_table: "NEW TABLE"
+        new_room: "NEW ROOM"
+        add_extra_charges: "ADD FOR EXTRA CHARGES"
+        home: "Home"
+        back: "Back"
+        menu: "Menu"
+        item_set: "Item Set"
+        item_attributes: "Item Attributes"
+        item_options: "Item Options"
+        submit: "SUBMIT"
+        new_simple_menu_item: "NEW SIMPLE MENU ITEM"
+        new_set_menu_item: "NEW SET MENU ITEM"
+        pick_image: "PICK IMAGE"
+        cancel: "CANCEL"
+      detail:
+        name: "Name"
+        type: "Type"
+        status: "Status"
+        order_by: "Order by"
+        seater: "Seater"
+        is_active: "Is active"
+        account: "Account"
+        created_by: "Created by"
+        created_at: "Created at"
+        actions: "Actions"
+        item_code: "Item code"
+        unit_price: "Unit price"
+        taxable: "Taxable"
+        charge_type: "Charge type"
+        minimum_free_time: "Minimum Free Time"
+        charge_block: "Charge block"
+        time_rounding: "Time rounding"
+        for: " for "
+        checkbox: "checkbox "
+        valid_days: "Valid Days"
+        valid_from: "Valid From"
+        valid_to: "Valid To"
+        sub_cat_count: "Sub-Cat Count"
+        items_count: "Items Count"
+        number_of: "number of "
+        category_code: "Category Code"
+        alt_name: "Alt name"
+        parent: "Parent"
+        parent_item: "Parent Item"
+        min_qty: "Min qty"
+        account_type: "Account type"
+        is_sub_item: "Is sub item"
+        unit: "Unit"
+        item_attributes: "Item attributes"
+        item_options: "Item options"
+        menu_item_image: "Menu Item Image"
+        item_sets: "Item sets"
+        instance_code: "Instance Code"
+        instance_name: "Instance Name"
+        price: "Price"
+        promotion: "Promotion"
+        item_instance_code: "Item instance code"
+        item_instance_name: "Item instance name"
+        is_on_promotion: "Is on promotion"
+        promotion_price: "Promotion price"
+        is_default: "Is default"
+        min_selectable_qty: "Min selectable qty"
+        max_selectable_qty: "Max selectable qty"
+        value: "Value"
+        
+        code_txt: "code "
+        charge_txt: "charge"
+        time_txt: "time"
+        block_txt: " block"
+        price_txt: " price"
+        zone_txt: "zone"
+        table_txt: "table"
+        seat_txt: "seat"
+        order_txt: "order"
+        room_txt: "room"
+        extra_charges_txt: "extra charges"
+        dashboard_txt: "dashboard"
+        data_txt: " data"
+        type_txt: "type"
+        home_txt: "go to dashboard"
+        back_txt: "go to "
+        name_txt : " name / user can view"
+        name_txt2: "name"
+        is_active_txt : "is active or not"
+        created_by_txt : "user who created "
+        actions_txt : "user can view/change "
+        actions_txt2 : "user can change/delete "
+        actions_txt3: "user can change "
+        status_txt: " is available or not"
+        created_at_txt: "datetime for created "
+        item_code_txt: "generated item code for "
+        taxable_txt: " taxable or not"
+        minimum_free_time_txt: "minimum time for free"
+        time_rounding_txt: "rounding time"
+        time_rounding_txt2: "time rounding"
+        write_txt: "to write "
+        menu_txt: "menu"
+        menu_categories_txt: "menu categories"
+        item_set_txt: "item set"
+        valid_days_txt: "valid days([1-7] => [Mon-Sun]) "
+        valid_from_txt: "valid from/start time "
+        valid_to_txt: "valid to/end time "
+        select_txt: "select"
+        sub_categories_txt: "sub categories"
+        items_txt: "items"
+        alt_name_txt: "alt name"
+        parent_txt: "parent"
+        menu_item_txt: "menu item"
+        parent_item_txt: "parent item"
+        simple_menu_item_txt: "simple menu item"
+        set_menu_item_txt: "set menu item"
+        min_qty_txt: "min qty"
+        account_type_txt: "account type"
+        sub_item_txt: "sub item"
+        unit_txt: "unit"
+        multi_select_txt: "multi select"
+        upload_txt: "upload"
+        item_attributes_txt: "item attributes"
+        item_options_txt: "item options"
+        image_txt: "image"
+        item_sets_txt: "item sets"
+        item_attributes_txt: "item attributes"
+        item_options_txt: "item options"
+        menu_item_instance_txt: "menu item instance"
+        promotion_txt: "promotion"
+        default_txt: "is default or not"
+        is_on_promotion_txt: "is on promotion or not"
+        min_selectable_qty_txt: "min selectable qty"
+        max_selectable_qty_txt: "max selectable qty"
+        value_txt: "value"
+        type_txt2: "user can view type"
+
+        cancel_btn_txt: "to cancel "
+        image_btn_txt: "to upload "
+        create_btn_txt: "to create "
+        submit_btn_txt: "to change "
+        new_btn_txt: "to add new "
+        show_btn_txt: "to view "
+        edit_btn_txt: "to edit "
+        delete_btn_txt: "to delete "
+
   helpers:
     page_entries_info:
       one_page:
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 22b8722e..52faa938 100755
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -20,6 +20,8 @@ mm:
   staff: "၀န်ထမ်းများ"
   products: "ကုန်စည်များ"
   promotions: "အရောင်းမြှင့်တင်ရေး"
+  commissions: "ကော်မရှင်များ"
+  commissioners: "ကော်မရှင်များ"
   printer: "ပရင့်တာ"
   logout: "ထွက်ရန်"
   sale: "အရောင်း"