Major refactor in ClickEditField