Refactor schedule builder model and view