Fix template and JS error
More .live -> .on changes