More prettification of the queue -> list