Some fixes and clean-up

removed unnecessary htmls
cleaned the js