Refactor page handling

1 job for master in 1 minute and 33 seconds (queued for 2 seconds)