Refactored field control widget to control widget.