Add data tables, footer, some validation