diff --git a/erpnext/public/js/pos/customer_toolbar.html b/erpnext/public/js/pos/customer_toolbar.html
index 86a38c3..a2cd834 100644
--- a/erpnext/public/js/pos/customer_toolbar.html
+++ b/erpnext/public/js/pos/customer_toolbar.html
@@ -1,5 +1,11 @@
-<div class="pos-bill-toolbar col-sm-9" style="display: flex;">
-	<div class="party-area" style="flex: 1;"></div>
+<div class="pos-bill-toolbar col-xs-9" style="display: flex; width: 70%;">
+	<div class="party-area" style="flex: 1;">
+		<span class="edit-customer-btn text-muted" style="display: inline;">
+			<a class="btn-open no-decoration" title="Edit Customer">
+				<i class="octicon octicon-pencil"></i>
+			</a>	
+		</span>
+	</div>
 	<button class="btn btn-default list-customers-btn" style="margin-left: 12px">
 		<i class="octicon octicon-organization"></i>
 	</button>
diff --git a/erpnext/public/js/pos/pos.html b/erpnext/public/js/pos/pos.html
index 827c794..54abf7e 100644
--- a/erpnext/public/js/pos/pos.html
+++ b/erpnext/public/js/pos/pos.html
@@ -1,7 +1,7 @@
 <div class="pos">
 	<div class="row">
 		<div class="col-sm-5 pos-bill-wrapper">
-			<div class="col-sm-12"><h6 class="form-section-heading uppercase">Item Cart</h6></div>
+			<div class="col-sm-12"><h6 class="form-section-heading uppercase">{{ __("Item Cart") }}</h6></div>
 			<div class="pos-bill">
 				<div class="item-cart">
 					<div class="pos-list-row pos-bill-header text-muted h6">
@@ -16,7 +16,7 @@
 					<div class="item-cart-items">
 						<div class="no-items-message text-extra-muted">
 							<span class="text-center">
-								<i class="fa fa-4x fa-shopping-cart"></i>
+								<i class="fa fa-2x fa-shopping-cart"></i>
 								<p>Tap items to add them here</p>
 							</span>
 						</div>
@@ -26,20 +26,20 @@
 				</div>
 			</div>
 			<div class="totals-area">
-				<div class="pos-list-row net-total-area hide">
+				<div class="pos-list-row net-total-area">
 					<div class="cell subject"></div>
 					<div class="cell"></div>
 					<div class="cell text-right">{%= __("Net Total") %}</div>
 					<div class="cell net-total text-right"></div>
 				</div>
-				<div class="pos-list-row tax-area hide">
+				<div class="pos-list-row tax-area">
 					<div class="cell subject"></div>
 					<div class="cell"></div>
 					<div class="cell text-muted">{%= __("Taxes") %}</div>
 					<div class="cell text-right tax-table"></div>
 				</div>
 				{% if (apply_discount_on) { %}
-				<div class="pos-list-row discount-amount-area hide">
+				<div class="pos-list-row discount-amount-area">
 					<div class="cell text-muted">{%= __("Discount") %}</div>
 					<div class="cell discount-field-col">
 						<div class="input-group input-group-sm">
@@ -56,9 +56,13 @@
 				</div>
 				{% } %}
 				<div class="pos-list-row grand-total-area" style="border-bottom:1px solid #d1d8dd;">
-					<div class="cell subject"></div>
+					<div class="cell">
+						<a class="collapse-btn">
+							<i class="octicon octicon-chevron-down"></i>
+						</a>
+					</div>
 					<div class="cell text-right bold">{%= __("Grand Total") %}</div>
-					<div class="cell grand-total text-right lead"></div>
+					<div class="cell subject grand-total text-right lead"></div>
 				</div>
 			</div>
 			<div class="row" style="margin-top: 30px">
@@ -84,10 +88,24 @@
 		</div>
 	</div>
 	<div class="col-sm-5 list-customers">
-
+		<div class="col-sm-12"><h6 class="form-section-heading uppercase">{{ __("Customers in Queue") }}</h6></div>
+		<div class="pos-list-row pos-bill-header">
+			<div class="cell"><input class="list-select-all" type="checkbox">{{ __("Customer") }}</div>
+			<div class="cell text-left">{{ __("Status") }}</div>
+			<div class="cell text-right">{{ __("Paid Amount") }}</div>
+			<div class="cell text-right">{{ __("Grand Total") }}</div>
+		</div>
+		<div class="list-customers-table border-left border-right border-bottom">
+			<div class="no-items-message text-extra-muted">
+				<span class="text-center">
+					<i class="fa fa-2x fa-user"></i>
+					<p>No Customers yet!</p>
+				</span>
+			</div>
+		</div>
 	</div>
 	<div class="col-sm-7 pos-items-section">
-		<div class="col-sm-12"><h6 class="form-section-heading uppercase">Stock Items</h6></div>
+		<div class="col-sm-12"><h6 class="form-section-heading uppercase">{{ __("Stock Items") }}</h6></div>
 		<div class="row pos-item-area">
 
 		</div>
diff --git a/erpnext/public/js/pos/pos_invoice_list.html b/erpnext/public/js/pos/pos_invoice_list.html
index 67110a7..fb15c86 100644
--- a/erpnext/public/js/pos/pos_invoice_list.html
+++ b/erpnext/public/js/pos/pos_invoice_list.html
@@ -1,7 +1,6 @@
-<div class="row list-row pos-invoice-list" invoice-name = "{{name}}">
-	<div class="col-xs-1"><input class="list-delete" type="checkbox"></div>
-	<div class="list-column col-xs-3">{%= customer %}</div>
-	<div class="list-column col-xs-2 text-left"><span class="indicator {{data.indicator}}">{{ data.status }}</span></div>
-	<div class="list-column col-xs-3 text-right">{%= paid_amount %}</div>
-	<div class="list-column col-xs-3 text-right">{%= grand_total %}</div>
+<div class="pos-list-row" invoice-name = "{{name}}">
+	<div class="list-column cell"><input class="list-delete" type="checkbox">{%= customer %}</div>
+	<div class="list-column cell text-left"><span class="indicator {{data.indicator}}">{{ data.status }}</span></div>
+	<div class="list-column cell text-right">{%= paid_amount %}</div>
+	<div class="list-column cell text-right">{%= grand_total %}</div>
 </div>
diff --git a/erpnext/public/js/pos/pos_item.html b/erpnext/public/js/pos/pos_item.html
index 7e374ae..fbc380b 100644
--- a/erpnext/public/js/pos/pos_item.html
+++ b/erpnext/public/js/pos/pos_item.html
@@ -23,10 +23,10 @@
 				{% if (item_image) { %}
 				<img src="{{ item_image }}" alt="{{item_name || item_code}}">
 				{% } %}
-				<button class="btn btn-default zoom-view hide" data-name="{{item_code}}">
-					<i class="fa fa-search-plus"></i>
-				</button>
 			</div>
+			<span class="price-info">
+				{{item_price}}
+			</span>
 		</a>
 	</div>
 </div>
\ No newline at end of file
diff --git a/erpnext/public/js/pos/pos_selected_item.html b/erpnext/public/js/pos/pos_selected_item.html
index ff97501..30cf0f0 100644
--- a/erpnext/public/js/pos/pos_selected_item.html
+++ b/erpnext/public/js/pos/pos_selected_item.html
@@ -3,10 +3,6 @@
 		<span class="cell bold">{{item_name}}</span>
 	</div>
 	<div class="pos-list-row">
-		<div class="cell">Price:</div>
-		<input class="form-control cell pos-item-price" value="{%= rate %}"/>
-	</div>
-	<div class="pos-list-row">
 		<div class="cell">Quantity:</div>
 		<input class="form-control cell pos-item-qty" value="{%= qty %}"/>
 	</div>
@@ -15,6 +11,10 @@
 		<input class="form-control cell pos-item-disc" value="{%= discount_percentage %}">
 	</div>
 	<div class="pos-list-row">
+		<div class="cell">Price:</div>
+		<input class="form-control cell pos-item-price" value="{%= rate %}"/>
+	</div>
+	<div class="pos-list-row">
 		<div class="cell">Amount:</div>
 		<input class="form-control cell" value="{%= amount %}"/>
 	</div>