almost completed homepage refactor