Don't nest if category/sub-category starts with a '__';
Improved styling of navigation