Improved Gruntfile; Updated index.tpl;