GUI: reorganization of widgets