Merging in changes from mindtree

* Templatized the mindtree HTML (originals kept)