Addresses parts point 2 of #788
@snwh I'm using GTKs default animation duration. I assume those are still o.k.?