Cleanup & updated pageController