Improved context-menu on right click