Continued Migration to jQuery

Moved remaining JS to more concise jQuery, hopefully for the last time