Added skip track feature
Minor fixes and label adjustments