Few more changes to Kiosk screens