further fixing navigation