Minor reorganization of rubric related partials and menus
Minor re-org of rubric related partials and menus