Refactoring Controller Pages