Refactored Home Page