more logical right-click menu structures