Refactoring to multiple pages part 1