Fixed up NPP page and a few minor tweaks