Revamp ContextMenu calls.  Add some for concept only.
Reorder method and slight simplification of Rels-related portion