Fixed up image display issues