add wrap, change footer
Rearanges javascript