Front end/refactor booking