Expanding Page-Navigation support added. (still a few glitches)