final fixes for nav