Table content organization fix