Changes buttons to help
Hopefully lineup the content a little better
Fixes some forms