homepage refactor