Home page refactor: 3