Misc navigation improvements