Add AGB and more form fields