Consolidate auto-submit control JS
JS rearrangement probably broke a few things but can't tell 'cos of no testing