Many fixes to image display