Dev/davide di carlo/improve javascript