Final fixes and some Jquery improvements