JS/jQuery related bugs

JS/jQuery related bugs

Fixes #213