cleaned up the navbar a little and now track nav state as part of the app state