fixing navigation problems