Added better transition animation