Wrap form element around stuff
Add button text
Fix bug