built in client ui rearranged