Final changes to the class hierarchy
so ImagesMenu can be represented correctly.