attempted to fix more nav glitches