Re-order form tags to avoid problems when submitting with enter.