Refactored views into partials