Rearranged some HTML elements.

Now with more semantics!