Recipe: more animation and layout tweaks
Resolve merge conflict