Adding some changes that fell out during Jon's revert
small changes to remove duplicate jquery script inclusion