Move the rest of the html to templates and sich

Fixes #35 and fixes #36