Unclear navigation in new modes

Other The Spike issues: