Minor refactor of 'navigate to' step