Working ...
Can render new categories
Fix merge conflict