More layout fixes. Support for animations.