Improve meesage and image display, speed and usability.

outdent to where it was before