tidied up widget inclusion section