update to html structure and js clean up