Fix up on GUI