More improvements on transitions