BRANCH 4.1: more fixes to the edit widget