Lots of navigation improvements (especially on the Universal App platforms)