better track list and map functionality