(22/22) added buttons
Merge remote-tracking branch 'origin/master'
(22/22) fixed spacing of buttons