diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 57f4eafc..f3a1fdf1 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -10,9 +10,12 @@ class Crm::CustomersController < BaseCrmController
       @crm_customers = Customer.order("customer_id").page(params[:page])
       #@products = Product.order("name").page(params[:page]).per(5)
     else
-      @crm_customers = Customer.where("name LIKE ?", "%#{filter}%").order("name").page(params[:page])    end
+      @crm_customers = Customer.search(filter) 
+      
+    end
     #@crm_customers  = Customer.all
-     @crm_customer   = Customer.new
+    @crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50)
+    @crm_customer   = Customer.new
 
     if flash["errors"]
       @crm_customer.valid?
@@ -52,7 +55,7 @@ class Crm::CustomersController < BaseCrmController
       membership      = MembershipSetting.find_by_membership_type("paypar_url")
 
       memberaction    = MembershipAction.find_by_membership_type("get_all_member_account")
-      merchant_uid       = memberaction.merchant_account_id.to_s
+      merchant_uid    = memberaction.merchant_account_id.to_s
       auth_token      = memberaction.auth_token.to_s
       url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index 7d0b5502..e3fc7378 100644
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -17,12 +17,17 @@ class Origami::CustomersController < BaseOrigamiController
     @sale_id        = params[:sale_id]
     filter          = params[:filter]
 
+    filter = params[:filter]
+    
     if filter.nil?
-      @crm_customers = Customer.order("name").page params[:page]
+      @crm_customers = Customer.order("customer_id").page(params[:page])
+      #@products = Product.order("name").page(params[:page]).per(5)
     else
-      @crm_customers = Customer.where("name LIKE ?", "%#{filter}%").order("name").page params[:page]
+      @crm_customers = Customer.search(filter) 
+      
     end
-    # @crm_customers   = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(2)
+    #@crm_customers  = Customer.all
+    @crm_customers   = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50)
     @crm_customer    = Customer.new
     
     if flash["errors"]
diff --git a/app/models/customer.rb b/app/models/customer.rb
index b5e101cb..93834b43 100644
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -34,12 +34,17 @@ class Customer < ApplicationRecord
 
   def self.search(search)
     if search
-      find(:all, :conditions => ['name LIKE ?', "%#{search}%"])
+      # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"])
+      where("name LIKE ? OR contact_no LIKE ?", "%#{search}%", "%#{search}%",) 
     else
       find(:all)
     end
   end
 
+  # def self.search(search)
+  #   where("name LIKE ? OR contact_no LIKE ?", "%#{search}%", "%#{search}%",) 
+  # end
+
   def lastest_invoices
     sales.where(:customer_id => self.id).order("created_at desc").limit(5)
   end
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index d72c6a38..17f207c3 100644
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -14,7 +14,7 @@
 
 
 <div class="row">
-  <div class="col-lg-8">
+  <div class="col-lg-7 col-md-7 col-sm-7">
       
       <div class="main-box-body clearfix">
         <div class="table-responsive">
@@ -42,20 +42,21 @@
             </thead>
 
             <tbody>
-              <% @crm_customers.each do |crm_customer| %>
-                <tr>
-                 <td>
-                 <input type="radio" style="width:20px;" value="<%= crm_customer.customer_id %>" name="checkbox" class="checkbox_check" ></td>
-                  <td><%= crm_customer.name %></td>
-                  <td><%= crm_customer.company %></td>
-                  <td><%= crm_customer.contact_no %></td>
-                  <td><%= crm_customer.email %></td>
-                  <td>
-                  <%= link_to 'Show', crm_customer_path(crm_customer) %>
-                    
-                  </td>
-                 
-                </tr>
+              <% if @crm_customers.count > 0  %> 
+                 <% @crm_customers.each do |crm_customer| %>
+                    <tr>
+                     <td>
+                     <input type="radio" style="width:20px;" value="<%= crm_customer.customer_id %>" name="checkbox" class="checkbox_check" ></td>
+                      <td><%= crm_customer.name %></td>
+                      <td><%= crm_customer.company rescue '-' %></td>
+                      <td><%= crm_customer.contact_no %></td>
+                      <td><%= crm_customer.email %></td>
+                      <td><%= link_to 'Show', crm_customer_path(crm_customer) %></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>
@@ -66,7 +67,7 @@
       </div>
 
   </div>
-  <div class="col-lg-4">
+  <div class="col-lg-4 col-md-4 col-sm-4">
 
     <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
 
@@ -115,6 +116,11 @@
   </div>
  <%end%>
 </div>
+<div class="col-lg-1 col-md-1 col-sm-1">
+         <a href="<%= crm_customers_path%>" class="btn btn-primary btn-lg ">
+         Back
+       </a>
+   </div>
 </div>
 
 
@@ -216,7 +222,4 @@ $(function() {
   }
 
 </script>
-
-
-     
-
+                  
\ No newline at end of file
diff --git a/app/views/layouts/CRM.html.erb b/app/views/layouts/CRM.html.erb
index 42b559e2..f1a43726 100644
--- a/app/views/layouts/CRM.html.erb
+++ b/app/views/layouts/CRM.html.erb
@@ -21,7 +21,7 @@
 						    <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
 
 						    <% if !flash["errors"]%>
-                  <%=message%>
+                 <%=message%>
                 <% end %>
 						  </div>
 			<% end %>
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 6fa5ae03..ba6ff75c 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -24,7 +24,8 @@
 
               <tr>
                  <td colspan="6">
-                    <%= form_tag crm_customers_path, :method => :get do %>
+                 <% path ="/origami/#{@sale_id}/customers" %>
+                    <%= form_tag path, :method => :get do %>
                       <div class="input-append form-group pull-left">
                         <input type="text" name="filter" placeholder="Search" class="form-control input-sm col-md-8">
                         <button type="submit" class="btn btn-primary btn-sm">Search</button>
@@ -42,17 +43,21 @@
             </thead>
 
             <tbody>
-              <% @crm_customers.each do |crm_customer| %>
-                <tr>
-                 <td>
-                 <input type="radio" style="width:20px;" value="<%= crm_customer.customer_id %>" name="checkbox" class="checkbox_check" ></td>
-                  <td><%= crm_customer.name %></td>
-                  <td><%= crm_customer.company rescue '-' %></td>
-                  <td><%= crm_customer.contact_no %></td>
-                  <td><%= crm_customer.email %></td>
-                  
-                 
-                </tr>
+              <% if @crm_customers.count > 0  %> 
+                 <% @crm_customers.each do |crm_customer| %>
+                    <tr>
+                     <td>
+                     <input type="radio" style="width:20px;" value="<%= crm_customer.customer_id %>" name="checkbox" class="checkbox_check" ></td>
+                      <td><%= crm_customer.name %></td>
+                      <td><%= crm_customer.company rescue '-' %></td>
+                      <td><%= crm_customer.contact_no %></td>
+                      <td><%= crm_customer.email %></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>