Refactor: demoted static templates to html to make things simpler