home page refactored