Make it look okay, make keyframes more robust