Make use of fandlebars
Fix comma
Add fandlebarsExtreme