Improved PageController