More work on animation and layouts.