Fix wording and add the queue position movement