Fix some remaining issues And add jquery stuff