diff --git a/app/views/customers/show.html.erb b/app/views/customers/show.html.erb
index 54045b5..cb7ca1e 100644
--- a/app/views/customers/show.html.erb
+++ b/app/views/customers/show.html.erb
@@ -27,12 +27,12 @@
         <div class="splitcontent">
           <div class="splitcontentleft">
             <h4><%=t(:estimates)%>:</h4>
-            <%= render partial: 'estimates/list', locals: {customer: @customer} %>
+            <%= render partial: 'estimates/list', locals: {estimates: @customer.estimates} %>
           </div>
 
           <div class="splitcontentleft">
             <h4><%=t(:label_invoices)%>:</h4>
-            <%= render partial: 'invoices/list', locals: {customer: @customer} %>
+            <%= render partial: 'invoices/list', locals: {invoices: @customer.invoices} %>
           </div>
         </div>
 
diff --git a/app/views/estimates/_list.html.erb b/app/views/estimates/_list.html.erb
index d078a69..2429fc8 100644
--- a/app/views/estimates/_list.html.erb
+++ b/app/views/estimates/_list.html.erb
@@ -1,6 +1,6 @@
-<% if @customer.present? %>
+<% if estimates.empty? %>
 
-  <% @customer.estimates.order(id: :desc).each do |estimate| %>
+  <% estimates.sort.reverse.each do |estimate| %>
     <div class="row">
       <b><%= link_to "##{estimate.doc_number}", estimate_path(estimate), target: :_blank %></b> <%= estimate.txn_date %>
     </div>
diff --git a/app/views/invoices/_list.html.erb b/app/views/invoices/_list.html.erb
index 775514c..0a2c801 100644
--- a/app/views/invoices/_list.html.erb
+++ b/app/views/invoices/_list.html.erb
@@ -1,24 +1,23 @@
-<% if @customer.present? %>
+<% if invoices.empty? %>
 
   <%= form_with(url: invoice_path, method: :get) do |form| %>
 
-    <% if @customer.invoices.count > 1 %>
+    <% if invoices.count > 1 %>
       <div class="form-check">
         <%= check_box_tag "select-all-invoices", "1", false, id: "select-all-invoices" %>
         <%= label_tag "select-all-invoices", t(:label_select_all) %>
       </div>
-
       <hr>
     <% end %>
 
-    <% @customer.invoices.order(id: :desc).each do |invoice| %>
+    <% invoices.sort.reverse.each do |invoice| %>
       <div class="row">
         <%= check_box_tag "invoice_ids[]", invoice.id, false, class: "invoice-checkbox"  %>
         <b><%= link_to "##{invoice.doc_number}", invoice_path(invoice), target: :_blank %></b> <%= invoice.txn_date %>
       </div>
     <% end %>
 
-    <% if @customer.invoices.count > 1 %>
+    <% if invoices.count > 1 %>
       <%= form.submit t(:button_bulk_pdf) %>
     <% end %>
   <% end %>