Clean up the markup

I tried to clean up the markup but it's needs a proper rewrite. Let me know if you're interested in a front-end guy!