working on fixing navigation