Trying to refactor the list of widgets