#36 - Fix Javascripts