Move things around, no more JQuery.