JS/jQuery Fixes