Reorganized the form structure and made some minor presentation changes.