Refactor editables

Fixes #557