Editor rewamp

See Feature requests

Notes