home page refactor