More track tweaks
Merge branch 'dev' of github.com:mdavis1982/collabordio into dev