Did some changes to the GUI