Updates to html templating
More updates