Table layout enhanced