More updates for CSS prep.

More updates to prepare for implementing CSS.