changed text pop-up, replaced Added  to Modified, saved position of the scroll when return
Merge remote-tracking branch 'origin/master'