Updated js and HTML