Show Categories on, and some Refactorings