navigation improvements