more work on animation and layout