reorganize: works well, widgets are nicely integrated, but there are still some bugs