Added CNAME and minor UI changes