Added Server-Client subclasses + UI updated