dealt with disconnection. UI is a bit better