Removed duplication from pages code
Removed duplication between Pages and PageLoader