refactor page creation a bit
use the new page creation syntax