Several fixes for JS and Bootstrap issues