Refactor partial views