refactored the tracks service, and fixed the enter/leave animations
updated TODO