Fixed editor
Improve demo