Nav now shows active view, and more