Did more work on right-click menu