Fixed XHTML errors; moved hardcoded HTML to template