Refactor bookingView v1