CBD-924:  use a table to put two elements in one box

Change-Id: I7310b5b943d1f14b3e072f60d584542cd912d0b1