Add some additional transitions and clean up the layouts

The animation handling was getting unruly. This at least makes it
respond the way it was intended to.