rework to use a SvSimpleTableContainer

Change-Id: I6737d75c70c36b19c5bec075f6f82f159ef00d2d