[Enhancement] [Bug Fix]

some changes everywhere

capture contextMenu events