Correctly combining animated transitions with incremental templates