Language changes and minor javascript
template changes