improve button & button-group