still fixing navigation