Multiple improvements on client side