Grunt build task improvement + template updates