Layout changes, cleanup required.
Replacing inline HTML within content files with shortcodes.