diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less
index 3ad8a0b..16857e3 100644
--- a/erpnext/public/less/erpnext.less
+++ b/erpnext/public/less/erpnext.less
@@ -19,9 +19,9 @@
 
 /* pos */
 
-.pos-item-area {
-	padding: 0px 10px;
-}
+// .pos-item-area {
+// 	padding: 0px 10px;
+// }
 
 .pos-item-wrapper {
 	padding: 5px;
@@ -65,20 +65,21 @@
 }
 
 .pos-item-area {
-	border: 1px solid #d1d8dd;
-	border-top: none;
+	// border: 1px solid #d1d8dd;
+	// border-top: none;
 }
 
 .pos-item-toolbar {
+	height: 51px; // remove later
 	padding: 10px 0px;
 	border-bottom: 1px solid #d1d8dd;
 }
 
-.item-list-area, .list-customers {
-	padding: 15px 0px;
-	overflow-y: scroll;
-	height: ~"calc(100vh - 162px)";
-}
+// .item-list-area, .list-customers {
+// 	padding: 15px 0px;
+// 	overflow-y: scroll;
+// 	height: ~"calc(100vh - 162px)";
+// }
 
 .pos-toolbar, .pos-bill-toolbar {
 	padding: 10px 0px;
@@ -91,20 +92,15 @@
 }
 
 .pos-bill-wrapper {
-	border: 1px solid #d1d8dd;
-	border-top: none;
-	margin-right: -1px;
+	// border: 1px solid #d1d8dd;
+	// border-top: none;
+	// margin-right: -1px;
 }
 
 .pos-bill {
-	border-top: 1px solid @border-color;
-	margin-left: -15px;
-	margin-right: -15px;
-}
-
-.item-cart {
-	overflow-y: scroll;
-	height: ~"calc(100vh - 72vh)";
+	// border-top: 1px solid @border-color;
+	// margin-left: -15px;
+	// margin-right: -15px;
 }
 
 .edit-pos-item {
@@ -119,17 +115,6 @@
 	cursor: pointer;
 }
 
-.pos-bill-row {
-	margin: 0px;
-	padding: 7px 0px;
-	border-top: 1px solid #d1d8dd;
-}
-
-.pos-bill-header {
-	border: none !important;
-	background-color: #f5f7fa;
-}
-
 .pos-item-qty {
 	display: inline-block;
 }
@@ -223,23 +208,48 @@
 	border-color: #e8e8e8;
 }
 
+
 .numeric-keypad {
-	border: 1px solid #d1d8dd;
-	height:69px;
-	width:69px;
-	font-size:20px;
-	font-weight:200;
-	background-color: #FDFDFD;
-	border-color: #e8e8e8;
+	// border: 1px solid #d1d8dd;
+	height: 60px;
+	width: 60px;
+	font-size: 20px;
+	font-weight: 200;
+	border-radius: 0;
+	background-color: #fff;
+	// background-color: #FDFDFD;
+	// border-color: #e8e8e8;
 	margin-left:-4px;
 }
 
+.numeric_keypad {
+	margin-left: -15px;
+
+	& > .row > button {
+		border: none;
+		border-right: 1px solid @border-color;
+		border-bottom: 1px solid @border-color;
+
+		&:first-child {
+			border-left: 1px solid @border-color;
+		}
+	}
+
+	& > .row:first-child > button {
+		border-top: 1px solid @border-color;
+	}
+}
+
 .pos-pay {
-	height:69px;
-	width:69px;
-	font-size:17px;
-	font-weight:200;
-	margin-left:-4px;
+
+	background-color: @brand-primary;
+	border: none;
+
+	// height:69px;
+	// width:69px;
+	// font-size:17px;
+	// font-weight:200;
+	// margin-left:-4px;
 }
 
 .multimode-payments {
@@ -322,4 +332,77 @@
 	.total-score, .grade, .score {
 		text-align: right;
 	}
+}
+
+.pos-list-row {
+	display: table;
+	table-layout: fixed;
+	width: 100%;
+	padding: 9px 15px;
+	font-size: 12px;
+	margin: 0px;
+	border-bottom: 1px solid @border-color;
+
+	.cell {
+		display: table-cell;
+		vertical-align: middle;
+	}
+
+	.subject {
+		width: 50%
+	}
+
+	.list-row-checkbox, .list-select-all {
+		margin-right: 7px;
+	}
+}
+
+.pos-bill-header {
+	background-color: #f5f7fa;
+	border: 1px solid @border-color;
+}
+
+.pos-bill-item.active {
+	background-color: @light-yellow;
+}
+
+.totals-area {
+	border-right: 1px solid @border-color;
+	border-left: 1px solid @border-color;
+	margin-bottom: 15px;
+}
+
+body[data-route="pos"] .page-body {
+	height: ~"calc(100vh - 40px)";
+}
+
+.item-cart-items {
+	height: 30vh;
+	overflow: auto;
+	border: 1px solid @border-color;
+	border-top: none;
+
+	.no-items-message {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+	}
+}
+
+.pos .items .pos-list-row:last-child {
+	border-bottom: none;
+}
+
+.pos .form-section-heading {
+	padding: 0;
+}
+
+.pos {
+	overflow: hidden;
+}
+
+.pos .item-list {
+	border-left: 1px solid @border-color;
+	border-right: 1px solid @border-color;
 }
\ No newline at end of file