Lots of cleanup and fixes, changed button colors, removed unneeded files and code, etc.