Update packages
Fix typos and update template
Update js
Update js
Update template