New page version WIP
New page version minor fixes