Updated content map slightly after feedback.
Merge accidental undo
Recommitting changes.