Updates to avoid jquery conflicts