changed buttons and some layout stuff
Merge remote-tracking branch 'origin/master'