add non-list editable logic
popup