Updated Page Controller and views