tidied up widgets and styles