Making some changes so the site works for CMS