button fixes and more text