Yet more reordering of js in html.