Page refactoring

Not necessarily good code, but at least better, and a step in the right direction.

I told you I was an easy mark.