Removed superfluous jquery and updated js to reflect newer conventions