Bit more work on the navigation