tweaks for new navigation changes