Refactor editables

Fixes #540, #556, #557, #560, #561