Update tempate
Finish JS and remove CS