Tidied up widgets.