Partials, controller refactoring