Sprint Day 2

Various markup and style changes to support the 4.0 template.