Fixing Bugs

Jquery conflicts in two scripts
renaming