More work on transitions & better spinner support...