Fix for page numbers and a WIP