Fixing expand of widgets