Reworked Table to be a Table Cell