added navigation management (rudimentary)