Refactor models, add cuttings and UI design