Refactor PageManager

Small refactor to simplify page construction methods