Further enhanced pages, added more content