More layout stuff. Deleting CNAME file
Merge conflict