More work on the Table widget for - XFRM-42