Logo animation tweaks
Resolve merge conflicts