Added a bunch of form elements