- Added correct table layout