Cleaning to merge to master

Removed internal text editor changes. Set notepad functionality back to
normal