Made client ui richer