diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb
index 4159372a..3b8eb22e 100755
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -88,7 +88,11 @@ class DiningFacility < ApplicationRecord
         checkout_at_min -= min
         if (checkout_at_hr <= hr) && (checkout_at_min <= 15)
           return booking
+        else 
+          return nil
         end
+      else 
+        return nil
       end
     end
   end
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 4e3d27c1..df7d3f5f 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -47,12 +47,8 @@
                           Table <%= table.name %>  ( <%= table.seater %> Seat )
                        </div>
                      </div>
-                 <% else %>
-                    <% if table.get_checkout_booking.nil? %>
-                      <div class="card tables blue text-white" data-id="<%= table.id %>">
-                    <% else %>
-                      <div class="card tables orange text-white" data-id="<%= table.id %>">
-                    <% end %>
+                 <% else %>                   
+                      <div class="card tables blue text-white" data-id="<%= table.id %>">                    
                         <div class="card-block">                        
                           Zone <%= table.zone_id %> <br>
                           Table <%= table.name %>  ( <%= table.seater %> Seat )
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 6368ede9..718eb73c 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -40,23 +40,15 @@
                   <% @tables.each do |table| %>       
                       <% if table.status == 'occupied' %>
                           <% if table.get_booking.nil? %>
-                            <% if table.get_checkout_booking.nil? %>
-                              <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
-                            <% else %>
-                              <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
-                            <% end %>
+                              <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">                            
                                 <div class="card-block">
                                   <%= table.name %>
                                   <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
                                   <div style="font-size:12px;"></div>
                                 </div>
                               </div>
-                          <% else %>
-                            <% if table.get_checkout_booking.nil? %>
-                              <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
-                            <% else %>
-                              <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
-                            <% end %>
+                          <% else %>                            
+                              <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">                            
                             <div class="card-block">
                                 <%= table.name %>
                                 <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index d8901f35..7b76ecd3 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -39,23 +39,15 @@
          <div class="card-columns">
            <% @tables.each do |table| %>
            <% if table.status == 'occupied' %>
-              <% if table.get_booking.nil? %>
-                <% if table.get_checkout_booking.nil? %>
-                  <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
-                <% else %>
-                  <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
-                <% end %>
+              <% if table.get_booking.nil? %>              
+                  <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">                
                     <div class="card-block">
                        <%= table.name %>
                          <span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
                     </div>
                   </div>
-              <% else %>
-                  <% if table.get_checkout_booking.nil? %>
-                    <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
-                  <% else %>
-                    <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
-                  <% end %>
+              <% else %>                
+                    <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">                 
                     <div class="card-block">
                        <%= table.name %>
                          <span class="pull-right font-12 new_text_<%= table.id %>"> new</span>