Arch Design: Edits on hybrid

General edits, especially:
Add links, fix capitalization, improve markup.

Change-Id: Ifda431c0f7e986d96e72bf5be996235039e3df71
Merge "Arch Design: Edits on hybrid"