Improved UI for booking system