Working on manage widgets + bugs fixed