Table layout is more robust now