Updated the Table layout