Graph fixed, GUI adapted