View partials refactor