Redesign form to use help and label
Add form validation - show errors