Fixed templating and added grunt