Refactor home section