refactor tracklist

I tried on my side and there is nothing broken, if anyone can help to give it a check would be appreciated.