tidy up (a bit) locations editing widget ; use pixbuf/string code from 2.0;remove...