Some UI improvements / WSConnection refactor