Improve $Loop: 0, 2 with arrow key navigation