Added new classes for toolbar