Change button positions to make more sense.
Merge remote-tracking branch 'origin/master'