Fixes for button sizing