Revisit venn diagram
* clean up template code
* align top
* #994