Design improvements to sites code

Change-Id: I08ffa6a97093abbe85169f664b97498c5f39bf8e
Merge "Design improvements to sites code"