Added partials to refactor views