improved highlight drawing
improved ui client unit test