fixing navigation method bugs