Shuffling things around
Refactor PageController to have smaller functions