Fix forms. Add thank page