Reorganize the GUI