switch to npr, layout changes