improved widgets removing hard-coded dependency from fields to configuration.