Redid transitions

Now they're a mix of the old transition and the new one; it slides in
and out, but not much, and it fades in and out to make up for it.