Version 2.0

* design updates on wiki, wiki.history templates
* refactoring, minor updates and fixes