HTML moved over to templates, resolves #11