Rework of $page