Small UI improvements. Using form submit event instead of button click event to enforce form validation.