Added fieldset and updated template
Renamed email field to identifier. Fixed model