Save work. Improve button and button group.