Re-work content pages a bit.