Cleaning up UI and tackling add same track 2+ times bug.