fix widget add and remove feature