tidied up widgets