* Show all categories
* Misc fixes
Merge
Misc fixes