buttons fixed
Merge branch 'seth'