Issue #39 :improve checkin layout & handling