severely simplified the edit -> display state transitions