Update template and list js
Resolve conflict