Fix pages shadowing issues