Page.cs refactoring