improved GUI context menu