Reorganized GUI layout