FE: Code refactoring for Pages & Categories