Fixed typos and migrated toolbar event handlers