Alter navigation tree functionality to include categories in nav
Tweak user roles detection