more js and html fixes