Refactored Home page