rework pages

Signed-off-by: Devon Scott-Tunkin <devon.scotttunkin@gmail.com>