Content page refactoring

Doing a bit more content page refactoring to shed some more legacy CSS. No style changes or new features here.