Improve shield with animations