Completed

update cms format and include 3 updated templates