Selected text automatically is displayed in the name field
Reordered fields to be consistent