Improve button layout.