Categories on home page refactor