button layout improvements