better HTML ouput (named blocks), add test file
simplified HTML output