Fix nested button groups