More tweaks for the navigateToStep: method (needs testing)