Fixed js hacks yaywoo!!
Merge conflicts