removed a button from the GUI
merge conflict, might have fucked up GUI.fig