Upgrade jquery to 2.1.1 and work on bugs