JS/jQuery related bugs

JS/jQuery related bugs