Finish improving editing existing file section - Fix #348