some template improvements
fix js
Merge origin/master