Moved widgets to separate library