Arch Design: Edits on multi-site

Especially:
Follow conventions better, improve markup, capitalization.

Change-Id: I5687257e2554daa3e9058daab057eff974dc8366
Merge "Arch Design: Edits on multi-site"