Add missing classes and ids for referencing items in new toolbar.