Image improvements.  Remove, show on edit, display on show (unfinished)