fixing navigation for rest of app