Updated Page and Template