drawing Client UI, stage II

* minor fixes