Add bold utility class
Replace duplicate container class with wrap class