Improve appearance and add track names.