fix more nav stuff