More table layout improvement