Text Buttons, Minor Fixes