[tr2]: Improvements plus started edit view