Added music related options and fixed fadeout