Fixed up, widget view working better