Moved widgets to match planed API