Introduction of button groups and a fix for better spacing on buttons (vertical align).