Added ButtonText (text next to some "button"), fixes to other stuff.