Fixed markup and spacing of buttons