UI Bug fixes
Bug fixes for image cells
Merge branch 'master' into AlexLocal