improve text on client only architecture