new ui stuff
Merge branch 'jeff-iter2' of https://github.com/jasnowiss/Tracks into jeff-iter2