Tentative fix for table layout