Buttons are now longer expand better with text