aligned buttons
Merge branch 'homequestion' into testing