- fixed template and JS issues