Tidying up form elements