Fixed/tweaked the commands and events + their context menu's and dialogs.
Merge