Slightly reorganized the GUI