Stopped hard-coding combination tracks and moved to a new 'Tracks' menu; changed function of the 'close' button of inner track