Structural changes to site + new site format