Fixed a bunch of bugs in the music stuff

Also, tried to make the UI more "consistent"