Added missing form elements