Refactor homepage v1