fixed some jquery conflicts