Small refactoring
Page.cs complete