management of two widget is now clean
little cleanning