Added CNAME and modified layouts