Some updates to improve the button layout.