added widgets, still w.i.p.