Much improved layout, transitions tend to not overlap now.