Booking form fix up