Made some navigation improvements.