Issue #66 fix screen and add editor option