Refactor Tracks component