Reorganized GUI