Updated main carpool layout for non drivers