Fixed up transition animations