diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 4e4d2b77..e2b86569 100644
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -80,7 +80,7 @@
   <!-- Column One -->
 
   <!-- Column Two -->
-  <div class="col-lg-6 col-md-6 col-sm-6">
+  <div class="col-lg-5 col-md-5 col-sm-5">
 	<!-- Discount Amount -->
     <div class="card">
         <div class="card-header">
@@ -167,14 +167,23 @@
 		      	<div class="col-md-3">
 		      		<div class="form-group">
 						<button id="net" class="btn btn-warning fluid action-btn">Net</button>
-						<button id="percentage" class="btn btn-primary fluid action-btn">Percentage</button>
-						<button id="pay-discount" class="btn btn-danger fluid action-btn">Enter</button>
+						<button id="percentage" class="btn btn-primary fluid action-btn">Percentage</button>	
+						<button id="remove-item" class="btn btn-default fluid action-btn">Remove</button>
 		      		</div>
 	        	</div>
 	      	</div>	
         </div>
     </div>
   </div>
+
+  <!-- Column Three -->
+  <div class="col-lg-1 col-md-1 col-sm-1">
+	<!-- Action Panel -->
+    <div>
+	    <button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami';"><i class="fa fa-arrow-left"></i> Back </button>
+		<button id="pay-discount" class="btn btn-danger btn-block action-btn">Enter</button>
+    </div>
+  </div>
 </div>
 
 <script type="text/javascript">
@@ -233,6 +242,16 @@ $(document).ready(function(){
 	    }
 	});
 
+	// Select discount-item
+	$('#order-items-table tbody').on('click', '.discount-item-row',function(){
+		if($(this).hasClass('selected-item') == true){
+			$(this).removeClass('selected-item');
+		}
+		else {
+	    	$(this).addClass('selected-item');
+	    }
+	});
+
 	// Select for account types
 	$(".accounts-type").on('click', function(e){
 		if($(this).hasClass('selected-account') == true){
@@ -241,6 +260,13 @@ $(document).ready(function(){
 		else {
 	    	$(this).addClass('selected-account');
 	    }
+
+	    var account_id = $(this).attr('id').substr(8);
+        $(".item-row").each(function(i){
+        	if($(this).children().find("#item-account-type").text() == account_id){
+        		$(this).addClass("selected-item");
+        	}
+        });       
 	});
 
 	// Calculate Net Discount for Payment
@@ -261,7 +287,10 @@ $(document).ready(function(){
 		}
 		else {
 			calculate_item_discount(0, discount_value, sale_items, account_types);	
-		}							
+		}	
+
+		// Remove Selection
+		selection_remove();						
 	});
 
 	// Calculate Percentage Discount for Payment
@@ -282,10 +311,21 @@ $(document).ready(function(){
 		}
 		else {
 			calculate_item_discount(1, discount_value, sale_items, account_types);	
-		}		
+		}
+
+		// Remove Selection
+		selection_remove();			
+	});
+
+	// Remove selected discount items
+	$("#remove-item").on('click', function(e){
+		e.preventDefault();
+
+		$('.discount-item-row.selected-item').each(function(i){
+			$(this).remove();
+		});
 	});
 
-	// Pay Discount
 	// Pay Discount for Payment
 	$("#pay-discount").on('click', function(e){
 		e.preventDefault();
@@ -331,6 +371,13 @@ function update_balance(){
 	$('#order-grand-total').text(total);
 }
 
+/* Remove Selection */
+function selection_remove(){
+	$(".item-row").removeClass("selected-item");
+	$(".discount_item_row").removeClass("selected-item");
+	$(".accounts-type").removeClass("selected-account");
+}
+
 /* Get Item rows but not discount*/
 function get_item_rows(){
 	var sale_items = [];	
@@ -359,11 +406,24 @@ function get_discount_item_rows(){
 	return sale_items;
 }
 
+/* Get discount Item rows */
+// function get_selected_discount_items(){
+// 	var sale_items = [];	
+// 	$('.discount-item-row').hasClass('.selected-item').each(function(i){
+// 		var sale_item = {};
+// 		sale_item.id = $(this).attr('id');
+// 		sale_item.name = $(this).find('#item-name-price').text();
+// 		sale_item.account_id = $(this).find('#item_account_type').text();
+// 		sale_item.price = $(this).find('#item-total-price').text();
+// 		sale_items.push(sale_item);
+// 	});	
+// 	return sale_items;
+// }
 
 /* Get Selected Sale Item's ID and Price */
 function get_selected_sale_items(){
 	var sale_items = [];	
-	$('.selected-item').each(function(i){
+	$('.item-row.selected-item').each(function(i){
 		var sale_item = {};
 		sale_item.id = $(this).attr('id').substr(0,16);
 		sale_item.name = $(this).find('#item-name-price').text().split('@')[0];
@@ -526,7 +586,7 @@ function item_row_template(type, item, discount_amount, amount){
 	if(type == 1){
 		dis_str = dis_str + "(" + amount + "%)"
 	}
-	var discount_item_row = "<tr class='item-row discount-item-row' id='" + item.id + "'>" +
+	var discount_item_row = "<tr class='discount-item-row' id='" + item.id + "'>" +
         						"<td style='width: 60%; text-align: left;'>" + 
         						"<span id='item_account_type' class='hidden'>" + 
         							item.account_id +
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 323380fb..76f481a9 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -243,7 +243,6 @@
     <!-- Waiter Buttons -->
     <button type="button" class="btn btn-primary btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
     <button type="button" class="btn btn-primary btn-block"> FOC </button>
-
   </div>
   </div>
 
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index d3b78719..1bbe5ce7 100644
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -178,7 +178,7 @@
              </tr>
              <tr>
                <td class="charges-name"><strong>Discount:</strong></td>
-               <td class="item-attr"><strong id="order-discount">(<%=@selected_item.total_discount rescue 0%>)</strong></td>
+               <td class="item-attr"><strong id="order-discount">(<%=@obj.total_discount rescue 0%>)</strong></td>
              </tr>
             <% if @status == "sale" %>
              <tr>