animation2: refactor layout transitions
animation2: fix for new toolkit etc.