Refactor+controller+view