Image selection from within the text editor
A bunch of small changes