More progress on USFM edit window