Home page refactor