FIX: WidgetEnvironment Issues