Home page refactored