Pretty up the HTML templates and fix the error template