updates for buttons and stuff
various changes
merge conflicts fixed