review tables merged into single table
proposal form migrated to twig