More work on: Table Widget - XFRM-42