Minor changes to toolbar widget organization.