Refactor Category page