Improved Right click menu #124