Added local client and modified remote client UI as well as behaviour