Add the html, some utilities, more handlers