Switched to angular.js