changes in BB container and basic widgets