[Button setup] Some cosmetic changes.
Merge branch 'master' into 1080p