better detection and layout for checkins