diff --git a/app/models/order.rb b/app/models/order.rb
index 5011276c..452db6c7 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -23,7 +23,7 @@ class Order < ApplicationRecord
     if self.new_booking
       booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
                                 :checkin_at => Time.now.utc, :checkin_by =>  self.employee_name,
-                                :booking_status => "new" })
+                                :booking_status => "assign" })
     else
       if (self.booking_id.to_i > 0 )
         booking = Booking.find(self.booking_id)
diff --git a/app/views/crm/home/_booking.html.erb b/app/views/crm/home/_booking.html.erb
index 13702bf6..b8d2ba50 100644
--- a/app/views/crm/home/_booking.html.erb
+++ b/app/views/crm/home/_booking.html.erb
@@ -21,10 +21,10 @@
       <div class="card-footer">
         <div class="row">
           <div class="col-md-6">
-          <button id="assign" data-id="<%= booking.id %>" data-type="complete" class="btn assign btn-primary btn-sm btn-block">ASSIGN</button>
+         
         </div>
          <div class="col-md-6">
-          <button id="cancel" data-id="<%= booking.id %>" data-type="cancel" class="btn btn-danger cancel btn-sm btn-block">CANCLE</button>
+          
         </div>
         </div>
       </div>
@@ -38,19 +38,21 @@ $(function(){
 
     $(".booking_click").on("click", function(){
       $(".summary-items tbody tr").remove();
+      $("#cancel").removeAttr("disabled");
+      $("#assign").removeAttr("disabled");
       var url = $(this).attr('data-ref');
       show_details(url); 
     }); 
 
     $('.assign').click(function(e){
-      var booking_id = $(this).attr("data-id")
+      var booking_id = $(this).val()
       var type       = $(this).attr("data-type")
 
       update_booking(booking_id,type)
     });
 
     $('.cancel').click(function(e){
-      var booking_id = $(this).attr("data-id")
+      var booking_id = $(this).val()
       var type       = $(this).attr("data-type")
 
       update_booking(booking_id,type)
@@ -71,7 +73,8 @@ function show_details(url_item){
             $("#table").text(data.table_name) 
             $("#order_at").text(data.checkin_at) 
             $("#order_by").text(data.checkin_by) 
-        
+            $("#assign").val(data.id) 
+            $("#cancel").val(data.id) 
             for(var field in item_data) {  
               if (item_data[field].item_name){
                   var price = parseFloat(item_data[field].price).toFixed(2);
diff --git a/app/views/crm/home/_queue.html.erb b/app/views/crm/home/_queue.html.erb
index 1633f901..5bbbd2bf 100644
--- a/app/views/crm/home/_queue.html.erb
+++ b/app/views/crm/home/_queue.html.erb
@@ -2,7 +2,7 @@
   
   <% @i = 0 %>
   <% @booking.each do |booking| %>
-    <% if booking.booking_status == "complete" %>
+    <% if booking.booking_status == "assign" %>
     <div class="card booking_click" data-ref="<%= api_booking_path booking.id%>" id="booking_block">
       <div class="card-block" id="card-block"  style="width:100%;">
         <h4 class="card-title">
diff --git a/app/views/crm/home/index.html.erb b/app/views/crm/home/index.html.erb
index 431ef4a4..a140f43c 100644
--- a/app/views/crm/home/index.html.erb
+++ b/app/views/crm/home/index.html.erb
@@ -5,7 +5,7 @@
     <!-- Nav tabs -->
     <ul class="nav nav-tabs" role="tablist">
       <li class="nav-item">
-        <a class="nav-link" data-toggle="tab" href="#completed" role="tab">Queue <span class="badge badge-pill badge-default"><%= @booking.where("booking_status=?","complete").count %></span></a>
+        <a class="nav-link" data-toggle="tab" href="#completed" role="tab">Queue <span class="badge badge-pill badge-default"><%= @booking.where("booking_status=?","assign").count %></span></a>
       </li>
       <li class="nav-item">
         <a class="nav-link active" data-toggle="tab" href="#tables" role="tab">Bookings <span class="badge badge-pill badge-default"><%= @booking.where("booking_status=?","new").count %></span></a>
@@ -94,6 +94,8 @@
     <!-- OQS Buttons -->
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print</button>
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print <br/>Order<br/>Summary</button>
+     <button id="assign" value="" disabled="disabled" data-type="assign" class="btn assign btn-primary btn-lg btn-block">ASSIGN</button>
+     <button id="cancel" value="" disabled="disabled" data-type="cancel" class="btn btn-danger cancel btn-lg btn-block">CANCLE</button>
 
   </div>
 </div>