Extended the GUI a bit