An other refacto for ease the management of widgets