ContextMenu positioning fix
Minor fix
Merge branch 'custom'