simple cleanup of classes and as well as tweaks to the cms content class