Fix audiotrackmenu selection issue; some minor refactoring;