more adaptions for the edit-box-handling