Major changes to the markup and CSS in preparation for JS updates