Fixed jquery issues