Changed old name "contextMenu" to "ContextElement"
Add some more comments