refact + prevant context menu