Started reorganizing the GUI