Better markup and handling of "Remove current image" in media modal.

Refs #214