Merge pull request #115 from glenwks/master

change button design
Merge remote-tracking branch 'upstream2/master'