Refactoring, masterPage added