Tweak animations
Merge branch 'custom'
Add more flyouts