Cosmetic changes with new js-file!