Refactored enhaner popup to use the 'fields' configuration