Cleaner code.
Final version of the form (with the checkbox)