Fixes to toolbar groups