*Added Remove/Add Track to TUI
Merge branch 'dev'