Fix menu for organization issues