Improved a bit positioning of Tracks and their tokens.