Fixing some stuff for pnp page and homepage