button layout improved