checkin screen fixes