Added JS and Fixed formatting