Refactor views with partials