GUI on the client side improved