Refactored Page creation