Updated form elements a little and added more custom fields