UI improvements in client side