Add support for tables, change header/footer