Refactored enhaner popup to use the 'fields' configuration
Merge branch 'dev' into feature/refactor_comments