changing button name and rects
Merge branch 'test1'
neatening some things up