Improved the PageViewController