remove hardcoded HTML and update the templates