homepage refactored