Improved page handling

* All pages are served using same data handling methods