Made checkin/out screens more dynamic