HTML cleanup, helper tools, and service update

* service2 is now called dossier, which has not been reflected in the
code.