Buttons are done, background changed.
Merge remote-tracking branch 'origin/master'