ContextMenu positioning fix
Add ContentDialog
Improvements and fixes