Minor button changes and createTrack