Updating HtmlFormat to suit the new router