Fixes for ContextMenu
Tweak ContextMenu animations