Did a wee bit more work on the interaction between widgets.