WIP pager
Minor improvements