Restructure markup

Restructured the markup to cleanly merge with Rob’s previous merge.