More polish, music toggle