diff --git a/hotel_calendar/static/src/css/view.css b/hotel_calendar/static/src/css/view.css
index 6a5cf20c6..46a9fbbc3 100644
--- a/hotel_calendar/static/src/css/view.css
+++ b/hotel_calendar/static/src/css/view.css
@@ -75,36 +75,30 @@
 
 .unify-enabled {
 	background-color: #43A200;
-	box-shadow: 0 0 8px 0px #43A200;
 	color: white;
 }
 
 .divide-enabled {
 	background-color: #43A200;
-	box-shadow: 0 0 8px 0px #43A200;
 	color: white;
 }
 
 .overbooking-enabled {
 	background-color: #43A200;
-	box-shadow: 0 0 8px 0px #43A200;
 	color: white;
 }
 
 .cancelled-enabled {
 	background-color: #43A200;
-	box-shadow: 0 0 8px 0px #43A200;
 }
 
 .swap-from {
 	background-color: #E7CF1D;
-	box-shadow: 0 0 8px 0px #E7CF1D;
 	color: #7C7BAD;
 }
 
 .swap-to {
 	background-color: #43A200;
-	box-shadow: 0 0 8px 0px #43A200;
 	color: white;
 }
 
@@ -156,12 +150,7 @@ input#bookings_search {
 	background-color: #FFA500;
 }
 
-.cancelled-highlight {
-	color: white;
-	background-color: #FFA500;
-}
-
-.overbooking-highlight i, .cancelled-highlight i {
+.overbooking-highlight i {
   color: white;
 }
 
@@ -388,4 +377,4 @@ div.pull-right-custom {
   margin-right: 15px;
   color: #777;
   text-align: right;
-}
\ No newline at end of file
+}
diff --git a/hotel_calendar/static/src/js/views/calendar/hotel_calendar_controller.js b/hotel_calendar/static/src/js/views/calendar/hotel_calendar_controller.js
index ed22d55d3..1c2bf4774 100644
--- a/hotel_calendar/static/src/js/views/calendar/hotel_calendar_controller.js
+++ b/hotel_calendar/static/src/js/views/calendar/hotel_calendar_controller.js
@@ -824,11 +824,13 @@ var PMSCalendarController = AbstractController.extend({
 
       var domain_checkouts = [
           ['checkout', '=', now_fmt],
-          ['state', 'not in', ['cancelled']]
+          ['state', 'in', ['booking']],
+          ['reservation_type', 'not in', ['out']]
       ];
       var domain_checkins = [
           ['checkin', '=', now_fmt],
-          ['state', 'not in', ['cancelled']]
+          ['state', 'in', ['confirm']],
+          ['reservation_type', 'not in', ['out']]
       ];
       var domain_overbookings = [
           ['checkin', '>=', dfrom_fmt],
@@ -843,7 +845,7 @@ var PMSCalendarController = AbstractController.extend({
           ['state', '=', 'cancelled']
       ];
 
-      $.when(
+      $.when(   
         this.model.search_count(domain_checkouts),
         this.model.search_count(domain_checkins),
         this.model.search_count(domain_overbookings),
diff --git a/hotel_calendar/views/actions.xml b/hotel_calendar/views/actions.xml
index 6648b557c..7ea531270 100644
--- a/hotel_calendar/views/actions.xml
+++ b/hotel_calendar/views/actions.xml
@@ -6,7 +6,9 @@
         <field name="res_model">hotel.reservation</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('checkin','=', datetime.datetime.now().strftime('%Y-%m-%d'))]</field>
+        <field name="domain">[('checkin','=', datetime.datetime.now().strftime('%Y-%m-%d'),
+                              ('state', 'in', ('confirm')),
+                              ('reservation_type', 'not in', ('out')))]</field>
     </record>
 
     <record model="ir.actions.act_window" id="hotel_reservation_action_checkout">
@@ -14,7 +16,9 @@
         <field name="res_model">hotel.reservation</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('checkout','=', datetime.datetime.now().strftime('%Y-%m-%d'))]</field>
+        <field name="domain">[('checkout','=', datetime.datetime.now().strftime('%Y-%m-%d'),
+                              ('state', 'in', ('booking')),
+                              ('reservation_type', 'not in', ('out')))]</field>
     </record>
 
     <record model="ir.actions.act_window" id="hotel_calendar_action_form_tree">