fixing templates & partials, tweak Gruntfile.js