html changes / merging to fix js