Improve UI/Client connections