Fixing jquery issues