Fixes to layout and animations