v0.7

Moved a little bit more of the HTML construction to the template file.