Fixed the JS and the HTML that weren't corrected with the latest changes