Tidied up the widget transition.