grey shadows and improved merging of object diagram options