fixing navigation framework