Correct invalid HTML
* Replace h2 with caption
* Make markup more easily styleable