Changed look of leisure=track, cleanup