Added more js, edited html