Fixed jquery conflict issues