* Switch to Jquery
* Bug fix