Refactoring some views with partials