GUI work continued