fix oops and make the client ui a bit more readable