I find it very difficult to recognize whether the Shuffle Play toggle (and the Repeat Toggle as well for that matter) is on or off (and no I am not color-blind 
). Therefore it would be of great benefit to include the original track number into the queue list, so that one can easily see if the queue is in- or out-of-sequence.
Many thanks in advance!