Fix booking page - layout fixes and prices include the surcharges