diff --git a/procentric/application/lib/hoteltv.ui_appfull.js b/procentric/application/lib/hoteltv.ui_appfull.js
index 8847bac..98fa890 100755
--- a/procentric/application/lib/hoteltv.ui_appfull.js
+++ b/procentric/application/lib/hoteltv.ui_appfull.js
@@ -2065,6 +2065,7 @@ HotelTV.ui_appfull = (function() {
                                         $('.main').addClass("depth_mm");
                                         __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
                                         __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
                                     });
                                 }, 500);
                             }
@@ -2115,6 +2116,7 @@ HotelTV.ui_appfull = (function() {
                                         $('.main').addClass("depth_mm");
                                         __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
                                         __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
                                     });
                                 }, 500);
                             }
@@ -2137,7 +2139,7 @@ HotelTV.ui_appfull = (function() {
                                     _state.menu.stage.cur = "amenity_ctgy_item_cart";
                                     __uifxn_AppFull_DrawAmUserGuide("amenity_ctgy_item_cart");
                                 } else {
-                                    HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.system.ott_service_not_ready[_state.lang], 5);
+                                    HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.ui.amenity.message.invalidCategory[_state.lang], 5);
                                 }
                             }
                         } else if (_state.menu.stage.cur == "amenity_ctgy_item_cart") {
@@ -3598,6 +3600,7 @@ HotelTV.ui_appfull = (function() {
                                         $('.main').addClass("depth_mm");
                                         __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
                                         __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
                                     });
                                 }, 500);
                             }
@@ -3647,6 +3650,7 @@ HotelTV.ui_appfull = (function() {
                                         $('.main').addClass("depth_mm");
                                         __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
                                         __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
                                     });
                                 }, 500);
                             }
@@ -3669,7 +3673,7 @@ HotelTV.ui_appfull = (function() {
                                     _state.menu.stage.cur = "roomservice_ctgy_item_cart";
                                     __uifxn_AppFull_DrawRsUserGuide("roomservice_ctgy_item_cart");
                                 } else {
-                                    HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.system.ott_service_not_ready[_state.lang], 5);
+                                    HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.ui.roomservice.message.invalidCategory[_state.lang], 5);
                                 }
                             }
                         } else if (_state.menu.stage.cur == "roomservice_ctgy_item_cart") {
@@ -6724,6 +6728,7 @@ HotelTV.ui_appfull = (function() {
                     }
                 } else if (_evt.keyCode == gRmtKey.yellow) {
                     // YELLOW BUTTON
+                    console.log("YELLOW::>");
                     if ("yellow" in _state.hotkey.mm) {
                         $('.guide>.tips').stop().animate({ backgroundColor: "rgba(0,0,0,0.8)" }, 500, function() {
                             if (_state.hotkey.mm.yellow.type == "brochure") {
@@ -6734,10 +6739,12 @@ HotelTV.ui_appfull = (function() {
                                 });
                             } else if (_state.hotkey.mm.yellow.type == "amenity") {
                                 if (_opening.amenity) {
+                                    console.log("YELLOW::>AMENITY");
                                     __uifxn_AppFull_BuildAmenity();
                                 }
                             } else if (_state.hotkey.mm.yellow.type == "roomservice") {
                                 if (_opening.roomService) {
+                                    console.log("YELLOW::>ROOMSERVICEC");
                                     __uifxn_AppFull_BuildRoomservice();
                                 }
                             }
@@ -6745,6 +6752,7 @@ HotelTV.ui_appfull = (function() {
                         HotelTV.api.ReportEvent([{'power': true, 'location':{'conId':_state.hotkey.mm['yellow'].id}}])
                     }
                 } else if (_evt.keyCode == gRmtKey.blue) {
+                    console.log("BLUE::>");
                     // BLUE BUTTON
                     if ("blue" in _state.hotkey.mm) {
                         $('.guide>.tips').stop().animate({ backgroundColor: "rgba(0,0,0,0.8)" }, 500, function() {
@@ -6756,10 +6764,12 @@ HotelTV.ui_appfull = (function() {
                                 });
                             } else if (_state.hotkey.mm.blue.type == "amenity") {
                                 if (_opening.amenity) {
+                                    console.log("BLUE::>AMENITY");
                                     __uifxn_AppFull_BuildAmenity();
                                 }
                             } else if (_state.hotkey.mm.blue.type == "roomservice") {
                                 if (_opening.roomService) {
+                                    console.log("BLUE::>ROOMSERVICE");
                                     __uifxn_AppFull_BuildRoomservice();
                                 }
                             }
diff --git a/procentric/application/theme/HJS00001/hoteltv.app.full.popup.css b/procentric/application/theme/HJS00001/hoteltv.app.full.popup.css
index 6dad307..8b8b803 100755
--- a/procentric/application/theme/HJS00001/hoteltv.app.full.popup.css
+++ b/procentric/application/theme/HJS00001/hoteltv.app.full.popup.css
@@ -828,7 +828,7 @@
     line-height: 137px;
     width: 50%;
     height: 60%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
     background-image: url(./images/quantity_edit_arrow.png);
@@ -849,7 +849,7 @@
     line-height: 91px;
     width: 50%;
     height: 40%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
 }
@@ -892,7 +892,7 @@
     padding: 0px 30px 0px 30px;
     overflow: hidden;
     text-align: center;
-    font-size: 32px;
+    font-size: 38px;
     color: rgba(51,51,51,1.0);
 }
 
@@ -1109,7 +1109,7 @@
     height: 65px;
     width: 96%;
     margin: 12px 2% 0px 2%;
-    padding: 4px 2% 0px 2%;
+    padding: 18px 2% 0px 2%;
     display: flex;
     float: left;
     flex-direction: row;
@@ -1120,7 +1120,7 @@
 
 
 .popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.summary>#label{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100px;
     font-size: 48px;
@@ -1128,7 +1128,7 @@
 }
 
 .popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.summary>#value{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100%;
     font-size: 52px;
@@ -1290,7 +1290,7 @@
     width: 100%;
     height: 132px;
     margin: 0;
-    padding: 0px 20px 0px 20px;
+    padding: 0px 20px 0px 48px;
     color: rgb(245,245,245);
     line-height: 32px;
     font-size: 32px;
@@ -1539,7 +1539,7 @@
     height: 65px;
     width: 96%;
     margin: 12px 2% 0px 2%;
-    padding: 4px 2% 0px 2%;
+    padding: 18px 2% 0px 2%;
     display: flex;
     float: left;
     flex-direction: row;
@@ -1550,7 +1550,7 @@
 
 
 .popup .amenity .order .winleft>.summary>#label{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100px;
     font-size: 48px;
@@ -1558,7 +1558,7 @@
 }
 
 .popup .amenity .order .winleft>.summary>#value{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100%;
     font-size: 52px;
@@ -1978,7 +1978,7 @@
     line-height: 137px;
     width: 50%;
     height: 60%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
     background-image: url(./images/quantity_edit_arrow.png);
@@ -1999,7 +1999,7 @@
     line-height: 91px;
     width: 50%;
     height: 40%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
 }
@@ -2042,7 +2042,7 @@
     padding: 0px 30px 0px 30px;
     overflow: hidden;
     text-align: center;
-    font-size: 32px;
+    font-size: 38px;
     color: rgba(51,51,51,1.0);
 }
 
@@ -2440,7 +2440,7 @@
     width: 100%;
     height: 132px;
     margin: 0;
-    padding: 0px 20px 0px 20px;
+    padding: 0px 20px 0px 48px;
     color: rgb(245,245,245);
     line-height: 32px;
     font-size: 32px;