Rearrange Ripple animations to fix errors and clarify