Switch a little of the html generation to jinja2
Updates to the catalog&server design documents