Fix widgets
8 files changed