fixing navigation; more work in progress