diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index b39a4c6e..6149a2bc 100644
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -227,20 +227,24 @@ $(document).ready(function(){
 		  	dataType: "json",
 		  	success: function(data) {
 		  		$("#customer_name").text(data["customer"].name);
-		  		$.each(data["response_data"]["data"], function (i) {
-		  			if(data["response_data"]["data"][i]["accountable_type"] == "RebateAccount"){
-		  				var balance = data["response_data"]["data"][i]["balance"];
-		  				if (data["response_data"]["status"]==true) {
-		  					$('.rebate_amount').removeClass('hide');
-			  				row =
-			                 '<td class="charges-name">' + data["response_data"]["data"][i]["accountable_type"] +'</td>'
-			                 +'<td class="item-attr">' + balance + '</td>';
+		  		if (data["response_data"]["data"].length) {
+		  			$.each(data["response_data"]["data"], function (i) {
+			  			if(data["response_data"]["data"][i]["accountable_type"] == "RebateAccount"){
+			  				var balance = data["response_data"]["data"][i]["balance"];
+			  				if (data["response_data"]["status"]==true) {
+			  					$('.rebate_amount').removeClass('hide');
+				  				row =
+				                 '<td class="charges-name">' + data["response_data"]["data"][i]["accountable_type"] +'</td>'
+				                 +'<td class="item-attr">' + balance + '</td>';
 
-			                 $(".rebate_amount").html(row);
-		  				}
+				                 $(".rebate_amount").html(row);
+			  				}
 
-		  			}
-		  		});
+			  			}
+			  		});
+		  	    }else{
+		  	    	$('.rebate_amount').addClass('hide');
+		  	    }
 		  	}
 		  });
 		    //End Ajax
diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb
index d806ec34..04f3acf9 100644
--- a/app/views/crm/customers/show.html.erb
+++ b/app/views/crm/customers/show.html.erb
@@ -1,26 +1,8 @@
 <div class="row">
-    <div class="col-lg-10 col-md-10 col-sm-10">
+    <div class="col-lg-11 col-md-11 col-sm-11">
       <!-- Column One -->
-
-        <!-- Nav tabs -->
-        <ul class="nav nav-tabs" role="tablist">
-            <li class="nav-item">
-                <a class="nav-link active" data-toggle="tab" href="#queue" role="tab">Customer Details </a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link " data-toggle="tab" href="#booking" role="tab">Orders </a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" data-toggle="tab" href="#customer" role="tab">Sales</a>
-            </li>
-        </ul>
-        <!-- Nav tabs - End -->
-
-        <div class="tab-content">
-
             <div class="tab-pane active" id="queue" role="tabpanel"">
                <div class="row">
-               <div class="col-md-3"></div>
                   <div class="col-md-6">
                   <br>
                       <h4>Customer Profile</h4>
@@ -51,11 +33,8 @@
                         </table>
                     </div>
                   </div>
-                </div>
-                <hr>
-                <div class="row">
-                  <div class="col-md-3"></div>
                   <div class="col-md-6">
+                    <br>
                       <h4>Membership Detail</h4>
                       <div class="table-responsive">
                         <table class="table table-striped">           
@@ -78,8 +57,22 @@
                       </div>
                   </div>
                 </div>
+                
             </div>
-
+         <!-- Nav tabs -->
+        <ul class="nav nav-tabs" role="tablist">
+           <!--  <li class="nav-item">
+                <a class="nav-link active" data-toggle="tab" href="#queue" role="tab">Customer Details </a>
+            </li> -->
+            <li class="nav-item">
+                <a class="nav-link " data-toggle="tab" href="#booking" role="tab">Orders </a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="tab" href="#customer" role="tab">Sales</a>
+            </li>
+        </ul>
+        <!-- Nav tabs - End -->
+        <div class="tab-content">
             <div class="tab-pane" id="booking" role="tabpanel">
                 <h3>Order Details</h3>
                 <div class="table-responsive">
@@ -114,9 +107,8 @@
                   </table>
                 </div>
             </div>
-
             <div class="tab-pane" id="customer" role="tabpanel">
-                  <h3>Sale Details</h3>
+             <h3>Sale Details</h3>
                 <div class="table-responsive">
                   <table class="table table-striped">           
                     <thead>
@@ -146,7 +138,6 @@
                   </table>
                </div>
             </div>
-
         </div>
 
     </div>
diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb
index 29cd001c..80befdc1 100644
--- a/app/views/transactions/orders/index.html.erb
+++ b/app/views/transactions/orders/index.html.erb
@@ -34,7 +34,6 @@
                 <th>Order status</th>
                 <th>Order date</th>
                 <th>Items Count</th>
-                 <th>Action</th>
               </tr>
             </thead>
 
@@ -42,13 +41,13 @@
               <% @orders.each do |order| %>
 
                 <tr>
-                  <td><%= order.order_id %></td>
+                  <td><%= link_to order.order_id, transactions_order_path(order) %></td>
                   <td><%= order.order_type %></td>
                   <td><%= order.customer.name rescue '-' %></td>
                   <td><%= order.status %></td>
                   <td> <%= order.date.strftime("%d-%m-%Y") %> </td>
                   <td> <%= order.item_count %> </td>
-                  <td><%= link_to 'Show', transactions_order_path(order) %></td>
+                  
                 </tr>
               <% end %>
             </tbody>
diff --git a/app/views/transactions/orders/show.html.erb b/app/views/transactions/orders/show.html.erb
index dc5bae88..e1127296 100644
--- a/app/views/transactions/orders/show.html.erb
+++ b/app/views/transactions/orders/show.html.erb
@@ -14,7 +14,7 @@
 <hr>
 
 <div class="row">
-  <div class="col-lg-12">
+   <div class="col-lg-11 col-md-11 col-sm-11">
       <div class="main-box-body clearfix">
         <div class="table-responsive">
           <table class="table table-striped">
@@ -70,13 +70,16 @@
               <% end %>
             </tbody>
           </table>
-          <a href="<%= transactions_orders_path%>" class="btn btn-primary pull-left">
-        <i class="fa fa-arrow-left fa-xs"></i> Back
-       </a>
+         
         </div>
       </div>
 
   </div>
+   <div class="col-lg-1 col-md-1 col-sm-1">
+      <a href="<%= transactions_orders_path%>" class="btn btn-primary">
+        <i class="fa fa-arrow-left fa-xs"></i> Back
+       </a>
+  </div>
 </div>
 
 
diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb
index b7e73219..2f437f3c 100644
--- a/app/views/transactions/sales/index.html.erb
+++ b/app/views/transactions/sales/index.html.erb
@@ -36,7 +36,6 @@
                 <th>Cashier</th>
                 <th>Sales status</th>
                 <th>Receipt Date</th>
-                 <th>Action</th>
               </tr>
             </thead>
 
@@ -44,14 +43,13 @@
               <% if @sales != 0 %>
                   <% @sales.each do |sale| %>
                     <tr>
-                      <td><%= sale.sale_id %></td>
+                      <td><%= link_to sale.sale_id, transactions_sale_path(sale) %></td>
                       <td><%= sale.receipt_no %></td>
                       <td><%= sale.grand_total rescue '-' %></td>
                       <td><%= sale.total_tax %></td>
                       <td><%= sale.cashier_name rescue '-' %></td>
                       <td> <%= sale.sale_status %> </td>
                       <td> <%= sale.receipt_date.strftime("%d-%m-%Y") %> </td>
-                      <td><%= link_to 'Show', transactions_sale_path(sale) %></td>
                     </tr>
                   <% end %>
               <% else %>
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb
index 5f6365e5..5f4e8f6e 100644
--- a/app/views/transactions/sales/show.html.erb
+++ b/app/views/transactions/sales/show.html.erb
@@ -82,12 +82,13 @@
                             <td>Discount</td>
                             <td colspan="2"><%= number_with_precision(@sale.total_discount, :precision => 2, :delimiter => ',') rescue ' '%></td>
                             </tr>
+                          <% @sale.sale_taxes.each do |r|%>
                           <tr>
                             <td colspan=2 style="text-align:center"></td>
-                            <td>Tax</td>    
-                            <td colspan="2"><%= number_with_precision(@sale.total_tax, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                            <td><%= r.tax_name %>(<%= r.tax_rate %>)</td>    
+                            <td colspan="2"><%= number_with_precision(r.tax_payable_amount, :precision => 2, :delimiter => ',') rescue ' '%></td>
                             </tr>
-                          
+                          <% end %> 
                           <tr>
                             <td colspan=2 style="text-align:center"></td>
                             <td>Grand Total</td>
@@ -99,21 +100,24 @@
                             <td>Pay Amount</td>
                             <td colspan="2"><%= number_with_precision(@sale.amount_received, :precision => 2, :delimiter => ',') rescue ' '%></td>
                             </tr>
-                          <tr>
-                            <td colspan=2 style="text-align:center"></td>
-                            <td>Change</td>
-                            <td colspan="2"><%= number_with_precision(@sale.amount_changed, :precision => 2, :delimiter => ',') rescue ' '%></td>
-                            </tr>
+                          
                           <% @sale_receivables.each do |r|%>
                           <tr>
                             <td colspan=2 style="text-align:center"></td>
                             <td>Payment <%= r.payment_method rescue ' '%></td>
                             <td colspan="2"><%= number_with_precision(r.payment_amount, :precision => 2, :delimiter => ',') rescue ' '%>
                             </td>
-                            
-                          </tr>   
+                          </tr> 
+
                           <% end %> 
 
+
+                          <tr>
+                            <td colspan=2 style="text-align:center"></td>
+                            <td>Change</td>
+                            <td colspan="2"><%= number_with_precision(@sale.amount_changed, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                          </tr>
+
                       </tbody>
                     </table>
 
@@ -160,7 +164,61 @@
             <div class="tab-pane" id="customer" role="tabpanel">
                   
                   <div class="table-responsive">
-                    <!--  -->
+                    <div class="row">
+                    <div class="col-md-6">
+                    <br>
+                        <h4>Customer Profile</h4>
+                        <div class="table-responsive">
+                          <table class="table table-striped">           
+                            <tbody>
+                              <tr>
+                                <th>Name</th>
+                                <td><%= @customer.name %></td>
+                              </tr>
+                              <tr>
+                                <th>Email</th>
+                                <td><%= @customer.email %></td>
+                              </tr>
+                              <tr>
+                                <th>Contact no</th>
+                                <td><%= @customer.contact_no %></td>
+                              </tr>
+                              <tr>
+                                <th>Company</th>
+                                <td><%= @customer.company %></td>
+                              </tr>
+                              <tr>
+                                <th>Date Of Birth</th>
+                                <td><%= @customer.date_of_birth %> </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                      </div>
+                    </div>
+                    <div class="col-md-6">
+                      <br>
+                        <h4>Membership Detail</h4>
+                        <div class="table-responsive">
+                          <table class="table table-striped">           
+                            <tbody>
+                             <% if @membership == 0 %>
+                                 <tr>
+                                  <td colspan="2">"There is no membership data"</td>
+                                </tr>
+                              <% else %>
+                                <% @membership.each do |member| %>
+                                  <tr>
+                                    <th><%= member["accountable_type"] %></th>
+                                    <td><%= member["balance"] %></td>
+                                  </tr>
+                                <% end %>
+                               
+                              <% end %>
+                            </tbody>
+                          </table>
+                        </div>
+                    </div>
+                  </div>
                 </div>
             </div>
 
@@ -169,16 +227,15 @@
     </div>
 
     <div class="col-lg-2 col-md-2 col-sm-2">
-      <a href="<%= transactions_sales_path%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg">
+      <a href="<%= transactions_sales_path%>" style="margin-top: 10px " class="btn btn-primary btn-lg">
         <i class="fa fa-arrow-left fa-lg"></i> Back
       </a>
       
       <!-- Temporary No Needs -->
-       <a href="<%= transactions_void_path(@sale)%>" style="margin-top: 10px " class="btn btn-danger pull-right btn-lg">
-
+       <a href="<%= transactions_void_path(@sale)%>" style="margin-top: 10px " class="btn btn-danger  btn-lg">
         <i class="fa fa-trash fa-lg"></i>  Void Sale
        </a>
-      <a href="<%= transactions_manual_complete_sale_path(@sale)%>"  style="margin-top: 10px " class="btn btn-success pull-right btn-lg">
+      <a href="<%= transactions_manual_complete_sale_path(@sale)%>"  style="margin-top: 10px " class="btn btn-success  btn-lg">
         <i class="fa fa-invoice fa-lg"></i> Complete Sale
       </a>
     </div>