Rework of editable widgets