Fix forms and add People table