Some modifications to the GUI and code structure.