Better solution to button-height problem