Added page navigation, some little improvements