diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index e102b036..262dc6e1 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -30,9 +30,10 @@
             <ul class="dropdown-menu">
                 <li>
                     <%if current_login_employee.role !="waiter" %>
-                        <a class="delete waves-effect waves-block" style="padding:0.5rem 1rem; margin-bottom: 0rem;" data-ref="<%=logout_path%>" data-method="delete">
-                            <i class="material-icons m-t-10">exit_to_app</i> Logout
-                        </a>
+                        <p class="delete waves-effect waves-block p-l-30 m-t-15" data-ref="<%=logout_path%>" data-method="delete">
+                            <i class="material-icons">exit_to_app</i>
+                            <span class="font-20 m-b-10">Logout</span>
+                        </p>
                          <span class="hidden" id="delete_text">
                             <h6>Are you sure you want to Logout ?</h6>
                             <!-- <h6>This action can't be undo. </h6> -->
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 07185c7e..e71c4edd 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -13,242 +13,244 @@
 
 <div class="row">
   <div class="col-lg-8 col-md-8 col-sm-8">
+    <div class="card">
+      <div class="main-box-body clearfix" id="order-detail-slimscroll" style="">
+        <div class="table-responsive">
+          <table id="origami-crm-table" class="table table-striped">
 
-    <div class="main-box-body clearfix" id="order-detail-slimscroll" style="">
-      <div class="table-responsive">
-        <table id="origami-crm-table" class="table table-striped">
+            <thead>
 
-          <thead>
-
-            <tr>
-             <td colspan="6">
-                <!--  <% path ="/origami/#{@sale_id}/customers" %>
-                    <%= form_tag path, :id => "filter_form", :method => :get do %>
-                      <div class="input-append col-md-7 form-group pull-left">
-                        <input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-9">
-                        <input type="hidden" name="type" id="type" value="">
-                        <button type="submit" class="btn btn-primary btn-sm">Search</button>                        
-                      </div>
-                    <% end %>
-                    <button id="member_acc_no" class="btn btn-success btn-sm"><span class="fa fa-credit-card"></span> Member Card</button> -->
-                    <div class="body">
-                      <% path ="/origami/#{@sale_id}/customers" %>
-                      <%= form_tag path, :id => "filter_form", :method => :get do %>
-                      <div class="row clearfix">
-                        <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
-
-                         <input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-12">
-                         <input type="hidden" name="type" id="type" value="<%= @dining_facility.type %>">
-
-                       </div>
-                       <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
-                        <button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
-                      </div>
-
-                      <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;">Member Card</button>
-
-                    </div>
-                    <% end %>
-                  </div>
-                </td>
-              </tr>
               <tr>
-                <th>Select</th>
-                <th>Sr.no</th>
-                <th>Name</th>
-                <th>Company</th>
-                <th>Contact no</th>
-                <th>Email</th>
-                <!-- <th>Paypar No</th> -->
-              </tr>
-            </thead>
+               <td colspan="6">
+                  <!--  <% path ="/origami/#{@sale_id}/customers" %>
+                      <%= form_tag path, :id => "filter_form", :method => :get do %>
+                        <div class="input-append col-md-7 form-group pull-left">
+                          <input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-9">
+                          <input type="hidden" name="type" id="type" value="">
+                          <button type="submit" class="btn btn-primary btn-sm">Search</button>                        
+                        </div>
+                      <% end %>
+                      <button id="member_acc_no" class="btn btn-success btn-sm"><span class="fa fa-credit-card"></span> Member Card</button> -->
+                      <div class="body">
+                        <% path ="/origami/#{@sale_id}/customers" %>
+                        <%= form_tag path, :id => "filter_form", :method => :get do %>
+                        <div class="row clearfix">
+                          <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
 
-            <tbody>
-              <% if @crm_customers.count > 0  %> 
-              <% @i = 0 %>
-              <% @crm_customers.each do |crm_customer| %>
+                           <input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-12">
+                           <input type="hidden" name="type" id="type" value="<%= @dining_facility.type %>">
 
-              <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
-               <td>
-                 <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
+                         </div>
+                         <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
+                          <button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
+                        </div>
+
+                        <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;">Member Card</button>
+
+                      </div>
+                      <% end %>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <th></th>
+                  <th><%= t("views.right_panel.detail.sr_no") %></th>
+                  <th><%= t("views.right_panel.detail.name") %></th>
+                  <th><%= t("views.right_panel.detail.card_no") %></th>
+                  <th><%= t("views.right_panel.detail.contact_no") %></th>
+                  <th><%= t("views.right_panel.detail.email") %></th>
+                  <!-- <th>Paypar No</th> -->
+                </tr>
+              </thead>
+
+              <tbody>
+                <% if @crm_customers.count > 0  %> 
+                <% @i = 0 %>
+                <% @crm_customers.each do |crm_customer| %>
+
+                <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
                  <td>
-                  <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> 
-                  <%= @i += 1 %>
-                  <%else%>
-                  -
-                  <% end %>
-                </td>
-                <td><%= crm_customer.name %></td>
-                <td><%= crm_customer.company rescue '-' %></td>
-                <td><%= crm_customer.contact_no %></td>
-                <td><%= crm_customer.email %></td>
-                <!-- <td><%= crm_customer.paypar_account_no %></td> -->
+                   <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
+                   <td>
+                    <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> 
+                    <%= @i += 1 %>
+                    <%else%>
+                    -
+                    <% end %>
+                  </td>
+                  <td><%= crm_customer.name %></td>
+                  <td><%= crm_customer.company rescue '-' %></td>
+                  <td><%= crm_customer.contact_no %></td>
+                  <td><%= crm_customer.email %></td>
+                  <!-- <td><%= crm_customer.paypar_account_no %></td> -->
 
-              </tr>
-              <% end %>
-              <%else%>
-              <tr><td colspan="5"><p style="text-align:center"><strong>There are no record for your search</strong></p></td></tr>
-              <% end %>
-            </tbody>
-          </table>
-          <br>
+                </tr>
+                <% end %>
+                <%else%>
+                <tr><td colspan="5"><p style="text-align:center"><strong>There are no record for your search</strong></p></td></tr>
+                <% end %>
+              </tbody>
+            </table>
+            <br>
 
-          <%= paginate @crm_customers %>
+            <%= paginate @crm_customers %>
+          </div>
         </div>
       </div>
-
     </div>
 
     <!-- <div class="col-lg-4 col-md-4 col-sm-4" style="min-height:600px; max-height:600px; overflow-x:scroll"> -->
     <div class="col-lg-3 col-md-3 col-sm-3" >
-      <div id="custom-slimscroll">
-        <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
-
-        <span class="patch_method"></span>
-        <input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
-        <input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" />
-        <input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" />
-        <%= f.error_notification %>
-        <%= f.hidden_field :id, :class => "form-control col-md-6 " %>    
-        <div class="form-group">
-          <label>Salutation :</label><br>
-          <label class="font-13">Mr</label>
-          <%= f.radio_button :salutation,"Mr", :class => "salutation mr", :value=>"Mr"%>
-          <label class="m-l--20">Miss</label>
-          <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs", :value=>"Mrs"%>
-          <label class="m-l--20">Mrs</label>
-          <%= f.radio_button :salutation,"Miss", :class => "salutation miss", :value=>"Miss"%>
-          <label class="m-l--20">Mdm</label>
-          <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm"%>    
-        </div>
-
-        <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
-          <%= f.input :name, :class => "form-control col-md-6 name", :required => true %>
-
-          <% flash.each do |name, msg| %>
-          <% str="[\"#{msg['name']}\"]"
-          str.gsub!('["', '')
-          str.gsub!('"]', '') %>
-          <span class="help-block"><%= str %></span>
-          <% end -%>
-        </div>
-
-        <div class="form-group">
-          <label>Gender :</label><br>
-          <label>Male</label>
-          <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%>
-          <label>Female</label>
-          <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%>
-        </div>
-
-        <div class="form-group">
-          <%= f.input :nrc_no, :label => "NRC No",:class => "form-control nrc_no" %>
-        </div>
-        <div class="form-group">
-          <%= f.input :company, :class => "form-control col-md-6 company"%>
-
-          <%  flash.each do |name, msg| %>
-          <% str="[\"#{msg['company']}\"]"
-          str.gsub!('["', '')
-          str.gsub!('"]', '') %>
-          <span class="help-block"><%= str %></span>
-          <% end -%>
-        </div>
-        <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
-          <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" ,:required => true%>
-
-          <%  flash.each do |name, msg| %>
-          <% str="[\"#{msg['contact_no']}\"]"
-          str.gsub!('["', '')
-          str.gsub!('"]', '') %>
-          <span class="help-block"><%= str %></span>
-          <% end -%>
-        </div>
-
-        <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
-          <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%>
-          <% flash.each do |name, msg| %>
-          <% str="[\"#{msg['contact_no']}\"]"
-          str.gsub!('["', '')
-          str.gsub!('"]', '') %>
-          <span class="help-block"><%= str %></span>
-          <% end -%>
-        </div>
-
-        <div class="form-group">
-          <%= f.input :address, :class => "form-control col-md-6 address" %>
-        </div>
-
-        <div class="form-group">
-          <label>Sr.No</label>
-          <input type="text" name="" value="<%=@count_customer%>" class="form-control" readonly="true">
-        </div>
-        <div class="form-group">
-          <label>Date Of Birth</label>
-          <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
-        </div>
-
-        <div class="form-group">
-          <label>Select Customer Type</label>
-          <select class="form-control col-md-12" id="customer_type" name="customer[customer_type]" style="height: 40px" >
-            <%  Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
-            <option value="<%= ct.value %>">
-              <%= ct.name %></option>
-              <%end %>
-            </select>            
-          </div>
+      <div class="card">
+      <div class="body" id="custom-slimscroll">
+          <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
 
+          <span class="patch_method"></span>
+          <input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
+          <input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" />
+          <input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" />
+          <%= f.error_notification %>
+          <%= f.hidden_field :id, :class => "form-control col-md-6 " %>    
           <div class="form-group">
-            <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true },  :class => "form-control col-md-6 tax_profiles" %>
+            <label><%= t("views.right_panel.detail.salutation") %> :</label><br>
+            <label class="font-15"><%= t("views.right_panel.detail.mr") %>
+            <%= f.radio_button :salutation,"Mr", :class => "salutation mr", :value=>"Mr"%></label>
+            <label class="font-15 m-l-20"><%= t("views.right_panel.detail.miss") %>
+            <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs", :value=>"Mrs"%></label>
+            <label class="font-15 m-l-20"><%= t("views.right_panel.detail.mrs") %>
+            <%= f.radio_button :salutation,"Miss", :class => "salutation miss", :value=>"Miss"%></label>
+            <label class="font-15 m-l-20"><%= t("views.right_panel.detail.mdm") %>
+            <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm"%></label>
           </div>
 
           <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
-            <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
+            <%= f.input :name, :class => "form-control col-md-6 name", :required => true %>
+
             <% flash.each do |name, msg| %>
             <% str="[\"#{msg['name']}\"]"
             str.gsub!('["', '')
             str.gsub!('"]', '') %>
-            <span class="help-block" style="margin-top:-10px"><%= str %></span>
+            <span class="help-block"><%= str %></span>
             <% end -%>
           </div>
+
           <div class="form-group">
-            <label>Paypar Account No:</label>
-            <div class="input-group">     
-              <input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly />
-              <div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
+            <label><%= t("views.right_panel.detail.gender") %> :</label><br>
+            <label><%= t("views.right_panel.detail.male") %>
+            <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%></label>
+            <label><%= t("views.right_panel.detail.female") %>
+            <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%></label>
+          </div>
+
+          <div class="form-group">
+            <%= f.input :nrc_no, :label => "NRC No",:class => "form-control nrc_no" %>
+          </div>
+          <div class="form-group">
+            <%= f.input :company, :class => "form-control col-md-6 company"%>
+
+            <%  flash.each do |name, msg| %>
+            <% str="[\"#{msg['company']}\"]"
+            str.gsub!('["', '')
+            str.gsub!('"]', '') %>
+            <span class="help-block"><%= str %></span>
+            <% end -%>
+          </div>
+          <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
+            <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" ,:required => true%>
+
+            <%  flash.each do |name, msg| %>
+            <% str="[\"#{msg['contact_no']}\"]"
+            str.gsub!('["', '')
+            str.gsub!('"]', '') %>
+            <span class="help-block"><%= str %></span>
+            <% end -%>
+          </div>
+
+          <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
+            <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%>
+            <% flash.each do |name, msg| %>
+            <% str="[\"#{msg['contact_no']}\"]"
+            str.gsub!('["', '')
+            str.gsub!('"]', '') %>
+            <span class="help-block"><%= str %></span>
+            <% end -%>
+          </div>
+
+          <div class="form-group">
+            <%= f.input :address, :class => "form-control col-md-6 address" %>
+          </div>
+
+          <div class="form-group">
+            <label><%= t("views.right_panel.detail.sr_no") %></label>
+            <input type="text" name="" value="<%=@count_customer%>" class="form-control" readonly="true">
+          </div>
+          <div class="form-group">
+            <label><%= t("views.right_panel.detail.date_of_birth") %></label>
+            <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
+          </div>
+
+          <div class="form-group">
+            <label><%= t("views.right_panel.detail.select_customer_type") %></label>
+            <select class="form-control col-md-12" id="customer_type" name="customer[customer_type]" style="height: 40px" >
+              <%  Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
+              <option value="<%= ct.value %>">
+                <%= ct.name %></option>
+                <%end %>
+              </select>            
             </div>
-          </div>
 
-          <div class="form-group">
-           <label>Select Member Group</label>
-           <select class="form-control col-md-12" name="member_group_id">
-            <option value="">Select Membership Group</option>
-            <%  Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
-            <option value="<%= member.value %>">
-              <%= member.name %></option>
-              <%end %>
-            </select>
-          </div>
+            <div class="form-group">
+              <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true },  :class => "form-control col-md-6 tax_profiles" %>
+            </div>
 
-          <div class="form-group">
-            <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect', :id => 'submit_customer' %>
-            <!--  <%= f.button :submit, "Update",:class => 'btn bg-blue btn-block', :disabled =>'', :id => 'update_customer' %> -->
+            <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
+              <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
+              <% flash.each do |name, msg| %>
+              <% str="[\"#{msg['name']}\"]"
+              str.gsub!('["', '')
+              str.gsub!('"]', '') %>
+              <span class="help-block" style="margin-top:-10px"><%= str %></span>
+              <% end -%>
+            </div>
+            <div class="form-group">
+              <label><%= t("views.right_panel.detail.paypar_account_no") %>:</label>
+              <div class="input-group">     
+                <input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly />
+                <div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
+              </div>
+            </div>
+
+            <div class="form-group">
+             <label><%= t("views.right_panel.detail.select_membership_group") %></label>
+             <select class="form-control col-md-12" name="member_group_id">
+              <option value=""><%= t("views.right_panel.detail.select_membership_group") %></option>
+              <%  Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
+              <option value="<%= member.value %>">
+                <%= member.name %></option>
+                <%end %>
+              </select>
+            </div>
+
+            <div class="form-group">
+              <%= f.submit t("views.btn.submit"),:class => 'btn btn-primary btn-lg waves-effect', :id => 'submit_customer' %>
+              <!--  <%= f.button :submit, "Update",:class => 'btn bg-blue btn-block', :disabled =>'', :id => 'update_customer' %> -->
+            </div>
+            <%end%>
           </div>
         </div>
-        <%end%>
       </div>
       <!-- Column Three -->
-     <div class="col-lg-1 col-md-1 col-sm-1">
+      <div class="col-lg-1 col-md-1 col-sm-1">
        <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
      </div>
-    </div>
+   </div>
 
-    <div id="sxModal">
-      <div id="sxModal-Content"><h3>Card Tap</h3></div>
-    </div>
+   <div id="sxModal">
+    <div id="sxModal-Content"><h3>Card Tap</h3></div>
   </div>
-  <script type="text/javascript">
-    $(function() {
+</div>
+<script type="text/javascript">
+  $(function() {
       /*$('.datepicker').datepicker({
        setDate: '12-12-1999',
        format : 'dd-mm-yyyy',
@@ -407,36 +409,36 @@
       customer = '(' + customer_name + ')';
     }
     swal({
-        title: "Confirmation !",
-        text: 'Are You Sure to assign this customer' + customer + '!',
-        showCancelButton: true,
-        confirmButtonColor: "green",
-        confirmButtonText: "Yes!",
-        cancelButtonClass: 'btn btn-danger',
-        closeOnConfirm: false,
-      }, function () {
-        $.ajax({
-          type: "POST",
-          url: "update_sale" ,
-          data: {customer_id:customer_id,sale_id:sale_id},
-          dataType: "json",
-          success: function(data) {
-            if(data.status == true)
-              {
-                var id       = $("#table_id").val()
-                var type     = $("#type").val()
-                if (type=="Table") {
-                  window.location.href = '/origami/table/'+id
-                }else{
-                  window.location.href = '/origami/room/'+id
-                }
-              }else{
-                swal("Alert!", "Record not found!", "error");
-                location.reload();
-              }
+      title: "Confirmation !",
+      text: 'Are You Sure to assign this customer' + customer + '!',
+      showCancelButton: true,
+      confirmButtonColor: "green",
+      confirmButtonText: "Yes!",
+      cancelButtonClass: 'btn btn-danger',
+      closeOnConfirm: false,
+    }, function () {
+      $.ajax({
+        type: "POST",
+        url: "update_sale" ,
+        data: {customer_id:customer_id,sale_id:sale_id},
+        dataType: "json",
+        success: function(data) {
+          if(data.status == true)
+          {
+            var id       = $("#table_id").val()
+            var type     = $("#type").val()
+            if (type=="Table") {
+              window.location.href = '/origami/table/'+id
+            }else{
+              window.location.href = '/origami/room/'+id
+            }
+          }else{
+            swal("Alert!", "Record not found!", "error");
+            location.reload();
           }
-        });        
-      });
+        }
+      });        
+    });
   }
 
   $('#back').on('click',function(){