ImageTable class added; Fixes