fixes around widget refactor