Refactored EditableField functionality.