Movign widgets into requirements