Added Email field and repositioned the field settings based on active selection