finished splitting out the widgets in copy paste fashion