JS issues were fixed