Neatening up the html templating a bit