Improve spacing of buttons