Minor improvements, send on form submit instead of button click.