Finalize design.
Split into files.
Change indenting to match new HTML.