More cleanup in Page Views
Minor fixes in Page Controllers.