Refactoring and unified categories render