Fixed editable functionality