Refactored homepage