Refactored home page