Reworked the HTML

Don't worry, it's still ugly as sin...