Move a few things around in the javascript and template.