Re-added ToolbarEvents.cs and some other changes, which were accidentally deleted in last merge.