GUI made a bit more TS aware