#255 fix and better supplementary views support in animations