Client and Order pages improvements