Fixing an improper nesting situation
Let's shoot for some html5
Some cleanup, and some improvements
Spacing
I think this garbage is fixed