Refactor controllers & views