New CP policy page and other tidy ups