Add ID field to forms
Added types to fields