Home page refactoring