diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index b18a3bac..218a7f66 100755
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -1,153 +1,152 @@
 
-    <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
-    <span class="patch_method"></span>
-    <%= f.hidden_field :id, :class => "form-control " %>   
+<%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
+<span class="patch_method"></span>
+<%= f.hidden_field :id, :class => "form-control " %>   
 
-    <div class="form-group">
-      <label> <%= t("views.right_panel.detail.salutation") %> :</label><br>
-      <label class="font-13"><%= t("views.right_panel.detail.mr") %>
-        <%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr", :style=>"width: 30px"%>
-      </label>&nbsp;
-      <label class="font-13 m-l--15"><%= t("views.right_panel.detail.miss") %>
-      <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs with-gap radio-col-indigo", :value=>"Mrs", :style=>"width: 30px"%>
-      </label>&nbsp;
-      <label class="font-13 m-l--15"><%= t("views.right_panel.detail.mrs") %>
-        <%= f.radio_button :salutation,"Miss", :class => "salutation miss with-gap radio-col-indigo", :value=>"Miss", :style=>"width: 30px"%>
-      </label>&nbsp;
-      <label class="font-13 m-l--15">
-        <%= t("views.right_panel.detail.mdm") %>
-        <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%>
-      </label>   
-    </div>
-  
-    <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
-      <%= f.input :name, :class => "form-control col-md-6 name", :required => true %>
-      <% flash.each do |test, msg| %>
-         <% 
-         str="[\"#{msg['name']}\"]"
-         str.gsub!('["', '')
-         str.gsub!('"]', '') %>
-         <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
-      <% end -%>
-    </div>
+<div class="form-group">
+  <label> <%= t("views.right_panel.detail.salutation") %> :</label><br>
+  <label class="font-13"><%= t("views.right_panel.detail.mr") %>
+    <%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr", :style=>"width: 30px"%>
+  </label>&nbsp;
+  <label class="font-13 m-l--15"><%= t("views.right_panel.detail.miss") %>
+    <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs with-gap radio-col-indigo", :value=>"Mrs", :style=>"width: 30px"%>
+  </label>&nbsp;
+  <label class="font-13 m-l--15"><%= t("views.right_panel.detail.mrs") %>
+    <%= f.radio_button :salutation,"Miss", :class => "salutation miss with-gap radio-col-indigo", :value=>"Miss", :style=>"width: 30px"%>
+  </label>&nbsp;
+  <label class="font-13 m-l--15">
+    <%= t("views.right_panel.detail.mdm") %>
+    <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%>
+  </label>   
+</div>
 
-    <div class="form-group">
-      <label><%= t("views.right_panel.detail.gender") %> :</label><br>
-      <label><%= t("views.right_panel.detail.male") %></label>
-      <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%>
-      <label><%= t("views.right_panel.detail.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 <%= (flash["errors"]) ? "error" : "" %>">
+  <%= f.input :name, :class => "form-control col-md-6 name", :required => true %>
+  <% flash.each do |test, msg| %>
+  <% 
+  str="[\"#{msg['name']}\"]"
+  str.gsub!('["', '')
+  str.gsub!('"]', '') %>
+  <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
+  <% end -%>
+</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!('"]', '') %>
-        <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
-      <% end -%>
-    </div>
-    <div class="form-group <%= (flash["errors"]) ? "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!('"]', '') %>
-        <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
-      <% end %>
-    </div>
+<div class="form-group">
+  <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 <%= (flash["errors"]) ? "error" : "" %>">
-      <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%>
-   
-      <% flash.each do |name, msg| %>
-         <% str="[\"#{msg['email']}\"]"
-            str.gsub!('["', '')
-            str.gsub!('"]', '') %>
-         <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
-      <% end %>
-    </div>
+<div class="form-group">
+  <%= f.input :nrc_no,:label => "NRC No", :class => "form-control nrc_no" %>
+</div>
 
-    <div class="form-group">
-      <%= f.input :address, :class => "form-control col-md-6 address" %>
-    </div>
+<div class="form-group">
+  <%= f.input :company, :class => "form-control col-md-6 company"%>
 
-    <div class="form-group">
-    <label><%= t("views.right_panel.detail.sr_no") %></label>
-    <div class="form-line disabled">
+  <%  flash.each do |name, msg| %>
+  <% str="[\"#{msg['company']}\"]"
+  str.gsub!('["', '')
+  str.gsub!('"]', '') %>
+  <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
+  <% end -%>
+</div>
+<div class="form-group <%= (flash["errors"]) ? "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!('"]', '') %>
+  <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
+  <% end %>
+</div>
+
+<div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
+  <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%>
+
+  <% flash.each do |name, msg| %>
+  <% str="[\"#{msg['email']}\"]"
+  str.gsub!('["', '')
+  str.gsub!('"]', '') %>
+  <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
+  <% 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>
+  <div class="form-line disabled">
     <input type="text" name="" value="<%=@count_customer%>" class="form-control" disabled="" >
-    </div>
-     
-   </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 selectpicker  show-tick" id="customer_type" name="customer[customer_type]" style="height: " >
-        <%  Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
-           <option value="<%= ct.value %>">
-          <%= ct.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 <%= (flash["errors"]) ? "error" : "" %>">
-      <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
-      <% flash.each do |name, msg| %>
-         <% str="[\"#{msg['card_no']}\"]"
-         str.gsub!('["', '')
-         str.gsub!('"]', '') %>
-         <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
-      <% end %>
-    </div>
-
-    <div class="form-group">
-      <label><%= t("views.right_panel.detail.paypar_account_no") %>:</label>
-      <div class="-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 selectpicker  show-tick"  name="member_group_id"  style="height: " >
-          <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>
+
+<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=>"datepicker form-control col-md-12"%>
+</div> 
+   
+<div class="form-group">
+  <label><%= t("views.right_panel.detail.select_customer_type") %></label>
+  <select class="form-control col-md-12 selectpicker  show-tick" id="customer_type" name="customer[customer_type]" style="height: " >
+  <%  Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
+  <option value="<%= ct.value %>">
+    <%= ct.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 <%= (flash["errors"]) ? "error" : "" %>">
+  <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
+  <% flash.each do |name, msg| %>
+  <% str="[\"#{msg['card_no']}\"]"
+  str.gsub!('["', '')
+  str.gsub!('"]', '') %>
+  <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
+  <% end %>
+</div>
+
+<div class="form-group">
+  <label><%= t("views.right_panel.detail.paypar_account_no") %>:</label>
+  <div class="-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 selectpicker  show-tick"  name="member_group_id"  style="height: " >
+  <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 "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %>
-        <%= f.submit "Update",:class => 'btn btn-info ', :disabled =>'', :id => 'update_customer' %> -->
-        <button type="submit" class="btn btn-primary" id="submit_customer"><%= t("views.btn.submit") %></button>
-        <button type="submit" class="btn btn-info" disabled id="update_customer"><%= t("views.btn.update") %></button>
-        <button type="button" class="btn btn-danger" id="reset"><%= t("views.btn.reset") %></button>
-  </div>
- <%end%>
+<div class="form-group">
+  <!-- <%= f.submit "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %>
+  <%= f.submit "Update",:class => 'btn btn-info ', :disabled =>'', :id => 'update_customer' %> -->
+  <button type="submit" class="btn btn-primary" id="submit_customer"><%= t("views.btn.submit") %></button>
+  <button type="submit" class="btn btn-info" disabled id="update_customer"><%= t("views.btn.update") %></button>
+  <button type="button" class="btn btn-danger" id="reset"><%= t("views.btn.reset") %></button>
+</div>
+<%end%>
 
 
 <div id="sxModal">
-    <div id="sxModal-Content"><h3><%= t :card_tap %></h3></div>
+  <div id="sxModal-Content"><h3><%= t :card_tap %></h3></div>
 </div>
 <!-- The modal -->
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="modalLabelLarge" aria-hidden="true">
@@ -155,9 +154,9 @@
     <div class="modal-content">
       <div class="modal-body">
         <div id="container">
-            <video autoplay="true" id="videoElement">
-             
-            </video>
+          <video autoplay="true" id="videoElement">
+
+          </video>
         </div>
       </div>
 
@@ -166,7 +165,7 @@
 </div>
 <script type="text/javascript">
   $(function() {
-    // Read Card Reader
+// Read Card Reader
     $("#paypar_account_no").on('focus', function(e){               
       if($(this).val() == ''){
         $("#sxModal").show();
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index 2f4ff77d..bf98b80e 100755
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -12,81 +12,92 @@
 
   <div class="row clearfix">
     <div class="col-lg-9 col-md-9 col-sm-9">
-      <!-- <div class="main-box-body clearfix"> -->
-      <div class="body table-responsive">
-        <table class="table table-hover table-striped">
-      <!-- <div class="table-responsive">
-        <table class="table table-striped"> -->
-          <thead>
-            <tr>
-            <td colspan="7">
-             <!--  <button id="member_acc_no" class="btn btn-success btn-md"><span class="fa fa-credit-card"></span> Member Card</button>
-              <button id="qr_code" class="btn btn-danger btn-md">
-                <span class="fa fa-credit-card"></span> QR CODE
-              </button> -->
-            <div class="body">
-              <%= form_tag crm_customers_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" placeholder="Search" id="search" class="form-control">
-                      <input type="hidden" name="type" id="type" value="">
+      <div class="card">
+        <div class="body">
+          <!-- <div class="main-box-body clearfix"> -->
+          <div class="body table-responsive">
+            <table class="table table-hover table-striped">
+          <!-- <div class="table-responsive">
+            <table class="table table-striped"> -->
+              <thead>
+                <tr>
+                <td colspan="7">
+                 <!--  <button id="member_acc_no" class="btn btn-success btn-md"><span class="fa fa-credit-card"></span> Member Card</button>
+                  <button id="qr_code" class="btn btn-danger btn-md">
+                    <span class="fa fa-credit-card"></span> QR CODE
+                  </button> -->
+                <div class="body">
+                  <%= form_tag crm_customers_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" placeholder="Search" id="search" class="form-control">
+                          <input type="hidden" name="type" id="type" value="">
+                    </div>
+                    <!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> -->
+                      <button type="submit" class="btn bg-blue waves-effect" style="margin-right: 10px;"><%= t("views.btn.search") %></button>
+                    <!-- </div> -->
+                      <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.memeber_card") %></button>
+                      <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.qr_code") %></button>
+                  </div>
+                  <% end %>
                 </div>
-                <!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> -->
-                  <button type="submit" class="btn bg-blue waves-effect" style="margin-right: 10px;"><%= t("views.btn.search") %></button>
-                <!-- </div> -->
-                  <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.memeber_card") %></button>
-                  <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.qr_code") %></button>
-              </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><%= t("views.right_panel.detail.action") %></th>
+              </tr>
+            </thead>
+
+            <tbody>
+              <% @i = 0 %>
+              <% @crm_customers.each do |crm_customer| %>
+
+              <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
+               <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.card_no rescue '-' %></td>
+                <td><%= crm_customer.contact_no %></td>
+                <td><%= crm_customer.email %></td>
+                <td><%= link_to t("views.btn.show"), crm_customer_path(crm_customer) %></td>
+
+              </tr>
+
               <% 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><%= t("views.right_panel.detail.action") %></th>
-          </tr>
-        </thead>
 
-        <tbody>
-          <% @i = 0 %>
-          <% @crm_customers.each do |crm_customer| %>
-
-          <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
-           <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.card_no rescue '-' %></td>
-            <td><%= crm_customer.contact_no %></td>
-            <td><%= crm_customer.email %></td>
-            <td><%= link_to t("views.btn.show"), crm_customer_path(crm_customer) %></td>
-
-          </tr>
-
-          <% end %>
-
-        </tbody>
-        </table>
-        <br>
-        <%= paginate @crm_customers %>
+            </tbody>
+            </table>
+            <br>
+            <%= paginate @crm_customers %>
+          </div>
+        <!-- </div> -->
+        </div>
       </div>
-    <!-- </div> -->
     </div>
     <div class="col-lg-3 col-md-3 col-sm-3">
-    <div id="custom-slimscroll">
-    <%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>
-    </div>
+      <div class="row">
+        <div class="col-md-12">
+          <div class="card">
+            <div class="body" id="custom-slimscroll">
+              <%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>
+            </div>
+          </div>
+        </div>
+      </div>
+    
     <!-- <div class="col-lg-1 col-md-1 col-sm-1 ">
       <br>
       <a href="<%= dashboard_path%>" class="btn btn-primary">