Making changes requested by Mr. Shrader

Renamed the categories, added two new items, renamed one item, added
Rigor/Relevance framework selector