Working on tables for PDF gen

All seems well for Extinguisher, although I need to solve a margin
problem