Some more changes, widget still buggy