From 1440f31fba98712ae19c0ba8a15e4a7b8e174b3d Mon Sep 17 00:00:00 2001
From: Jennifer Aube <62511019+jaube05@users.noreply.github.com>
Date: Mon, 30 Sep 2024 07:59:50 -0400
Subject: [PATCH] updating forms

---
 src/pages/adoption/adoption-application.en.js |  50 +++++---
 src/pages/adoption/adoption-application.fr.js |  44 ++++---
 src/pages/contact.en.js                       |   2 +-
 src/pages/contact.fr.js                       |   8 +-
 src/pages/fosters/become-a-foster.en.js       |   3 +-
 src/pages/fosters/become-a-foster.fr.js       |   5 +-
 src/pages/fosters/foster-application.en.js    | 108 ++++++++++++-----
 src/pages/fosters/foster-application.fr.js    | 110 +++++++++++++-----
 src/sass/pages/adoptions.scss                 |   7 ++
 src/sass/pages/forms.scss                     |   4 +-
 src/templates/adoptions.js                    |   4 +
 src/templates/fr/adoptions.js                 |   4 +
 12 files changed, 253 insertions(+), 96 deletions(-)

diff --git a/src/pages/adoption/adoption-application.en.js b/src/pages/adoption/adoption-application.en.js
index 7722959..c5688d2 100644
--- a/src/pages/adoption/adoption-application.en.js
+++ b/src/pages/adoption/adoption-application.en.js
@@ -35,7 +35,7 @@ const AdoptionApplication = () => {
     e.preventDefault()
     const myForm = e.target;
     const formData = new FormData(myForm);
-    fetch("/", {
+    fetch("/adoption-application.en.js", {
         method: "POST",
         headers: { "Content-Type": "application/x-www-form-urlencoded" },
         body: new URLSearchParams(formData).toString(),
@@ -75,8 +75,8 @@ const AdoptionApplication = () => {
       <div className="container">
             <h1>Adoption Application</h1>
             <form className='adoption-application-form' name="adoption-application" method="post" data-netlify="true" data-netlify-honeypot="bot-field"
-              onSubmit={handleSubmit} id="adoption-application-form">
-                <input type="hidden" name="form-name" value="contact" />
+              onSubmit={handleSubmit} id="adoption-application">
+                <input type="hidden" name="form-name" value="adoption-application" />
                 <input type="hidden" name="bot-field" />
                 <div className="row clearfix">
                     
@@ -112,25 +112,31 @@ const AdoptionApplication = () => {
                           type="text" required name="cat" value={cat} minLength="3" placeholder="Your Answer" />
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Are you looking for a male or a female cat/kitten? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Are you looking for a male or a female cat/kitten? <span className='required'>*</span></legend>
                         <label className='radio-label' for="male">Male<input id="male" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setSex(target.value)}
                           type="radio" required name="sex" value={sex} minLength="3" /></label>
                           <label className='radio-label' for="female">Female<input id="female" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setSex(target.value)}
                           type="radio" required name="sex" value={sex} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Does age matter? <span className='required'>*</span></div>
-                        <label className='radio-label' for="ageyes">Yes<input id="ageyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAge(target.value)}
-                          type="radio" required name="age" value={age} minLength="3" /></label>
-                          <label className='radio-label' for="ageno">No<input id="ageno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAge(target.value)}
-                          type="radio" required name="age" value={age} minLength="3" /></label>
+                      <fieldset>
+                        <legend className='radio-option'>Does age matter? <span className='required'>*</span></legend>
+                        <p><label className='radio-label' for="ageyes">Yes<input id="ageyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAge(target.value)}
+                          type="radio" required name="age" value={age} minLength="3" /></label></p>
+                          <p><label className='radio-label' for="ageno">No<input id="ageno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAge(target.value)}
+                          type="radio" required name="age" value={age} minLength="3" /></label></p>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Do you have a veterinarian that you plan on using for the cat? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Do you have a veterinarian that you plan on using for the cat? <span className='required'>*</span></legend>
                         <label className='radio-label' for="vetyes">Yes<input id="vetyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setVet(target.value)}
                           type="radio" required name="vet" value={vet} minLength="3"  /></label>
                           <label className='radio-label' for="vetno">No<input id="vetno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setVet(target.value)}
                           type="radio" required name="vet" value={vet} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
                         <label for="vetname">What is the name of the veterinarian or the veterinarian clinic that you plan on using? <span className='required'>*</span></label>
@@ -143,11 +149,13 @@ const AdoptionApplication = () => {
                           type="text" required name="declaw" value={declaw} minLength="3" placeholder="Your Answer" />
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Are you currently employed? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Are you currently employed? <span className='required'>*</span></legend>
                         <label className='radio-label' for="employedyes">Yes<input id="employedyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setEmployed(target.value)}
                           type="radio" required name="employed" value={employed} minLength="3" /></label>
                           <label className='radio-label' for="employedno">No<input id="employedno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setEmployed(target.value)}
                           type="radio" required name="employed" value={employed} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
                         <label for="work">Are you working from home due to covid and will you be returning to your work location? <span className='required'>*</span></label>
@@ -155,32 +163,40 @@ const AdoptionApplication = () => {
                           type="text" required name="work" value={work} minLength="3" placeholder="Your Answer" />
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Do you rent or own your home? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Do you rent or own your home? <span className='required'>*</span></legend>
                         <label className='radio-label' for="homeyes">Yes<input id="homeyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setHome(target.value)}
                           type="radio" required name="home" value={home} minLength="3" /></label>
                           <label className='radio-label' for="homeno">No<input id="homeno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setHome(target.value)}
                           type="radio" required name="home" value={home} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>If rent, are you allowed to keep pets? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>If rent, are you allowed to keep pets? <span className='required'>*</span></legend>
                         <label className='radio-label' for="homepetsyes">Yes<input id="homepetsyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setHomePets(target.value)}
                           type="radio" required name="homepets" value={homepets} minLength="3"  /></label>
                           <label className='radio-label' for="homepetsno">No<input id="homepetsno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setHomePets(target.value)}
                           type="radio" required name="homepets" value={homepets} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Do you have access to a vehicle and are you willing to travel to Grenville, QC in order to retrieve the cat/kitten? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Do you have access to a vehicle and are you willing to travel to Grenville, QC in order to retrieve the cat/kitten? <span className='required'>*</span></legend>
                         <label className='radio-label' for="retrieveyes">Yes<input id="retrieveyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setRetrieve(target.value)}
                           type="radio" required name="retrieve" value={retrieve} minLength="3"  /></label>
                           <label className='radio-label' for="retrieveno">No<input id="retrieveno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setRetrieve(target.value)}
                           type="radio" required name="retrieve" value={retrieve} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Do you have someone to care for the cat/kitten when you travel or are away from home for more than 24 hours? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Do you have someone to care for the cat/kitten when you travel or are away from home for more than 24 hours? <span className='required'>*</span></legend>
                         <label className='radio-label' for="awayyes">Yes<input id="awayyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAway(target.value)}
                           type="radio" required name="away" value={away} minLength="3"  /></label>
                           <label className='radio-label' for="awayno">No<input id="awayno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAway(target.value)}
                           type="radio" required name="away" value={away} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
                         <label for="other">Do you have other pets, kids or roommates? Please provide details. <span className='required'>*</span></label>
@@ -203,9 +219,11 @@ const AdoptionApplication = () => {
                           type="text" required name="accessories" value={accessories} minLength="3" placeholder="Your Answer" />
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Should your application be approved and an agreement be completed, an adoption fee will be charged. The adoption fee for a kitten is $350, the adoption fee for an adult cat is $200, and the adoption fee for a senior cat or a humanitarian adoption varies (please contact us for details regarding specific cats.) The adoption fee covers the spay or neuter operation, flea treatments, deworming and vaccinations (as well as booster shots when applicable). <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Should your application be approved and an agreement be completed, an adoption fee will be charged. The adoption fee for a kitten is $350, the adoption fee for an adult cat is $200, and the adoption fee for a senior cat or a humanitarian adoption varies (please contact us for details regarding specific cats.) The adoption fee covers the spay or neuter operation, flea treatments, deworming and vaccinations (as well as booster shots when applicable). <span className='required'>*</span></legend>
                         <label className="radio-label-cost" for="cost">I understand<input id="cost" onChange={({ target }) => setCost(target.value)}
                           type="radio" required name="cost" value={cost} minLength="3" placeholder="Your Answer" /></label>
+                          </fieldset>
                     </div>
                     <div className="form-group">
                         <label for="message">Do you have any questions about adopting a cat or kitten from Bennie's Rescue? <span className='required'>*</span></label>
diff --git a/src/pages/adoption/adoption-application.fr.js b/src/pages/adoption/adoption-application.fr.js
index f27dd66..0af2514 100644
--- a/src/pages/adoption/adoption-application.fr.js
+++ b/src/pages/adoption/adoption-application.fr.js
@@ -35,7 +35,7 @@ const AdoptionApplication = () => {
     e.preventDefault()
     const myForm = e.target;
     const formData = new FormData(myForm);
-    fetch("/", {
+    fetch("/adoption-application.fr.js", {
         method: "POST",
         headers: { "Content-Type": "application/x-www-form-urlencoded" },
         body: new URLSearchParams(formData).toString(),
@@ -74,9 +74,9 @@ const AdoptionApplication = () => {
       <Header page='/en/adoption/adoption-application'/>
       <div className="container">
             <h1>Demande D'Adoption</h1>
-            <form className='adoption-application-form' name="adoption-application" method="post" data-netlify="true" data-netlify-honeypot="bot-field"
-              onSubmit={handleSubmit} id="adoption-application-form">
-                <input type="hidden" name="form-name" value="contact" />
+            <form className='adoption-application-fr' name="adoption-application-fr" method="post" data-netlify="true" data-netlify-honeypot="bot-field"
+              onSubmit={handleSubmit} id="adoption-application-fr">
+                <input type="hidden" name="form-name" value="adoption-application-fr" />
                 <input type="hidden" name="bot-field" />
                 <div className="row clearfix">
                     
@@ -112,25 +112,31 @@ const AdoptionApplication = () => {
                           type="text" required name="cat" value={cat} minLength="3" placeholder="Votre Réponse" />
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Vous recherchez un chat/chaton mâle ou femelle ? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Vous recherchez un chat/chaton mâle ou femelle ? <span className='required'>*</span></legend>
                         <label className='radio-label' for="male">Mâle<input id="male" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setSex(target.value)}
                           type="radio" required name="sex" value={sex} minLength="3" /></label>
                           <label className='radio-label' for="female">Femelle<input id="female" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setSex(target.value)}
                           type="radio" required name="sex" value={sex} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>L’âge a-t-il de l’importance ? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>L’âge a-t-il de l’importance ? <span className='required'>*</span></legend>
                         <label className='radio-label' for="ageyes">Oui<input id="ageyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAge(target.value)}
                           type="radio" required name="age" value={age} minLength="3" /></label>
                           <label className='radio-label' for="ageno">Non<input id="ageno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAge(target.value)}
                           type="radio" required name="age" value={age} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Avez-vous un vétérinaire que vous prévoyez de contacter pour le chat ? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Avez-vous un vétérinaire que vous prévoyez de contacter pour le chat ? <span className='required'>*</span></legend>
                         <label className='radio-label' for="vetyes">Oui<input id="vetyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setVet(target.value)}
                           type="radio" required name="vet" value={vet} minLength="3"  /></label>
                           <label className='radio-label' for="vetno">Non<input id="vetno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setVet(target.value)}
                           type="radio" required name="vet" value={vet} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
                         <label for="vetname">Quel est le nom du vétérinaire ou de la clinique vétérinaire que vous prévoyez utiliser ? <span className='required'>*</span></label>
@@ -143,11 +149,13 @@ const AdoptionApplication = () => {
                           type="text" required name="declaw" value={declaw} minLength="3" placeholder="Votre Réponse" />
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Êtes-vous actuellement employé ? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Êtes-vous actuellement employé ? <span className='required'>*</span></legend>
                         <label className='radio-label' for="employedyes">Oui<input id="employedyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setEmployed(target.value)}
                           type="radio" required name="employed" value={employed} minLength="3" /></label>
                           <label className='radio-label' for="employedno">Non<input id="employedno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setEmployed(target.value)}
                           type="radio" required name="employed" value={employed} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
                         <label for="work">Vous travaillez à domicile en raison du covid et retournerez-vous sur votre lieu de travail ? <span className='required'>*</span></label>
@@ -155,34 +163,42 @@ const AdoptionApplication = () => {
                           type="text" required name="work" value={work} minLength="3" placeholder="Votre Réponse" />
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Êtes-vous locataire ou propriétaire de votre maison? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Êtes-vous locataire ou propriétaire de votre maison? <span className='required'>*</span></legend>
                         <label className='radio-label' for="homerent">Louer<input id="homerent" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setHome(target.value)}
                           type="radio" required name="home" value={home} minLength="3" /></label>
                           <label className='radio-label' for="homeown">Propre<input id="homeown" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setHome(target.value)}
                           type="radio" required name="home" value={home} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Si vous louez, êtes-vous autorisé à garder des animaux de compagnie ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Si vous louez, êtes-vous autorisé à garder des animaux de compagnie ?<span className='required'>*</span></legend>
                         <label className='radio-label' for="homepetsyes">Oui<input id="homepetsyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setHomePets(target.value)}
                           type="radio" required name="homepets" value={homepets} minLength="3"  /></label>
                           <label className='radio-label' for="homepetsno">Non<input id="homepetsno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setHomePets(target.value)}
                           type="radio" required name="homepets" value={homepets} minLength="3"  /></label>
                           <label className='radio-label' for="homepetsna">Non Applicable<input id="homepetsna" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setHomePets(target.value)}
                           type="radio" required name="homepets" value={homepets} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Avez-vous accès à un véhicule et êtes-vous prêt à vous déplacer à Grenville, QC afin de récupérer le chat/chaton ? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Avez-vous accès à un véhicule et êtes-vous prêt à vous déplacer à Grenville, QC afin de récupérer le chat/chaton ? <span className='required'>*</span></legend>
                         <label className='radio-label' for="retrieveyes">Oui<input id="retrieveyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setRetrieve(target.value)}
                           type="radio" required name="retrieve" value={retrieve} minLength="3"/></label>
                           <label className='radio-label' for="retrieveno">Non<input id="retrieveno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setRetrieve(target.value)}
                           type="radio" required name="retrieve" value={retrieve} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Avez-vous quelqu’un pour prendre soin du chat/chaton lorsque vous voyagez ou êtes absent de chez vous pendant plus de 24 heures ? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Avez-vous quelqu’un pour prendre soin du chat/chaton lorsque vous voyagez ou êtes absent de chez vous pendant plus de 24 heures ? <span className='required'>*</span></legend>
                         <label className='radio-label' for="awayyes">Oui<input id="awayyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAway(target.value)}
                           type="radio" required name="away" value={away} minLength="3" /></label>
                           <label className='radio-label' for="awayno">Non<input id="awayno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAway(target.value)}
                           type="radio" required name="away" value={away} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
                         <label for="other">Avez-vous d'autres animaux de compagnie, des enfants ou des colocataires ? Veuillez fournir des détails. <span className='required'>*</span></label>
@@ -205,9 +221,11 @@ const AdoptionApplication = () => {
                           type="text" required name="accessories" value={accessories} minLength="3" placeholder="Votre Réponse" />
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Si votre demande est approuvée et qu'un accord est conclu, des frais d'adoption seront facturés. Les frais d'adoption pour un chaton sont de 350 $, les frais d'adoption pour un chat adulte sont de 200 $ et les frais d'adoption pour un chat âgé ou une adoption humanitaire varient (veuillez nous contacter pour plus de détails concernant des chats spécifiques). Les frais d'adoption couvrent l'opération de stérilisation, les traitements contre les puces, la vermifugation et les vaccinations (ainsi que les rappels, le cas échéant). <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Si votre demande est approuvée et qu'un accord est conclu, des frais d'adoption seront facturés. Les frais d'adoption pour un chaton sont de 350 $, les frais d'adoption pour un chat adulte sont de 200 $ et les frais d'adoption pour un chat âgé ou une adoption humanitaire varient (veuillez nous contacter pour plus de détails concernant des chats spécifiques). Les frais d'adoption couvrent l'opération de stérilisation, les traitements contre les puces, la vermifugation et les vaccinations (ainsi que les rappels, le cas échéant). <span className='required'>*</span></legend>
                         <label class="radio-label-cost" for="cost">Je comprends<input id="cost" onChange={({ target }) => setCost(target.value)}
                           type="radio" required name="cost" value={cost} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className="form-group">
                         <label for="message">Avez-vous des questions sur l'adoption d'un chat ou d'un chaton chez Sauvetage Bennie's? <span className='required'>*</span></label>
diff --git a/src/pages/contact.en.js b/src/pages/contact.en.js
index 51bcad8..b7aa54a 100644
--- a/src/pages/contact.en.js
+++ b/src/pages/contact.en.js
@@ -14,7 +14,7 @@ const Contact = () => {
     e.preventDefault()
     const myForm = e.target;
     const formData = new FormData(myForm);
-    fetch("/", {
+    fetch("/contact.en.js", {
         method: "POST",
         headers: { "Content-Type": "application/x-www-form-urlencoded" },
         body: new URLSearchParams(formData).toString(),
diff --git a/src/pages/contact.fr.js b/src/pages/contact.fr.js
index 2f2cfcf..a060a86 100644
--- a/src/pages/contact.fr.js
+++ b/src/pages/contact.fr.js
@@ -14,7 +14,7 @@ const Contact = () => {
     e.preventDefault()
     const myForm = e.target;
     const formData = new FormData(myForm);
-    fetch("/", {
+    fetch("/contact.fr.js", {
         method: "POST",
         headers: { "Content-Type": "application/x-www-form-urlencoded" },
         body: new URLSearchParams(formData).toString(),
@@ -34,9 +34,9 @@ const Contact = () => {
       <div className="container">
         <div className="row">
             <h1>Contactez-nous</h1>
-            <form className='contact-us-form' name="contact" method="post" data-netlify="true" data-netlify-honeypot="bot-field"
-              onSubmit={handleSubmit} id="contact-form">
-                <input type="hidden" name="form-name" value="contact" />
+            <form className='contact-us-form' name="contact-fr" method="post" data-netlify="true" data-netlify-honeypot="bot-field"
+              onSubmit={handleSubmit} id="contact-fr">
+                <input type="hidden" name="form-name" value="contact-fr" />
                 <input type="hidden" name="bot-field" />
                 <div className="row clearfix">
                     <div className=" form-group">
diff --git a/src/pages/fosters/become-a-foster.en.js b/src/pages/fosters/become-a-foster.en.js
index 2e18ee4..e32a2c7 100644
--- a/src/pages/fosters/become-a-foster.en.js
+++ b/src/pages/fosters/become-a-foster.en.js
@@ -52,9 +52,10 @@ const BecomeFosters = () => {
                 <li>Commitment to Education and Advocacy: Fostering a pet often needs you to advocate for the pet's needs in home, and possible medical care.</li>
               </ul>
             <div className="application-button">
-              <a href="/en/foster-application"className="application-btn btn btn-primary btn-header">Submit Application</a>
+              <a href="/en/fosters/foster-application"className="application-btn btn btn-primary btn-header">Submit Application</a>
             </div>
           </div>
+          
       </div>
       <section className="adopt-cta">
         <Adopt />
diff --git a/src/pages/fosters/become-a-foster.fr.js b/src/pages/fosters/become-a-foster.fr.js
index 70b5a9a..991a720 100644
--- a/src/pages/fosters/become-a-foster.fr.js
+++ b/src/pages/fosters/become-a-foster.fr.js
@@ -52,8 +52,11 @@ const BecomeFosters = () => {
                 <li>Flexibilité et patience : les enfants placés en famille d'accueil peuvent avoir vécu des traumatismes et avoir besoin de temps pour s'adapter. La patience et la flexibilité sont essentielles.</li>
         
             </ul>
-        
+            <div className="application-button">
+              <a href="/fr/fosters/foster-application"className="application-btn btn btn-primary btn-header">Soumettre une demande</a>
+            </div>
         </div>
+        
       </div>
       <section className="adopt-cta">
         <Adopt />
diff --git a/src/pages/fosters/foster-application.en.js b/src/pages/fosters/foster-application.en.js
index c5fef82..a258039 100644
--- a/src/pages/fosters/foster-application.en.js
+++ b/src/pages/fosters/foster-application.en.js
@@ -46,7 +46,7 @@ const FosterApplication = () => {
     e.preventDefault()
     const myForm = e.target;
     const formData = new FormData(myForm);
-    fetch("/", {
+    fetch("/foster-application.en.js", {
         method: "POST",
         headers: { "Content-Type": "application/x-www-form-urlencoded" },
         body: new URLSearchParams(formData).toString(),
@@ -91,12 +91,12 @@ const FosterApplication = () => {
 };
   return (
     <main>
-      <Header page='/fr/fosters/adoption-application'/>
+      <Header page='/fr/fosters/foster-application'/>
       <div className="container">
             <h1>Foster Application</h1>
             <form className='foster-application-form' name="foster-application" method="post" data-netlify="true" data-netlify-honeypot="bot-field"
-              onSubmit={handleSubmit} id="contact-form">
-                <input type="hidden" name="form-name" value="contact" />
+              onSubmit={handleSubmit} id="foster-application">
+                <input type="hidden" name="form-name" value="foster-application" />
                 <input type="hidden" name="bot-field" />
                 <div className="row clearfix">
                     <div className="form-group">
@@ -111,11 +111,13 @@ const FosterApplication = () => {
                           type="text" required name="name" value={name} minLength="3" placeholder="Your Answer" />
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Are you 18 years of age or older? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Are you 18 years of age or older? <span className='required'>*</span></legend>
                         <label className='radio-label' for="ageyes">Yes<input id="ageyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAge(target.value)}
                           type="radio" required name="age" value={age} minLength="3"  /></label>
                           <label  className='radio-label' for="ageno">No<input id='ageno' className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAge(target.value)}
                           type="radio" required name="age" value={age} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
                         <label for="phone">Phone Number <span className='required'>*</span></label>
@@ -133,30 +135,37 @@ const FosterApplication = () => {
                           type="text" required name="why" value={why} minLength="3" placeholder="Your Answer" />
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Do you own or rent your home? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Do you own or rent your home? <span className='required'>*</span></legend>
                         <label for="homerent" className='radio-label'>Rent<input id="homerent" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setHome(target.value)}
                           type="radio" required name="home" value={home} minLength="3" /></label>
                           <label for="homeown" className='radio-label'>Own<input id="homeown" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setHome(target.value)}
                           type="radio" required name="home" value={home} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>If you rent your home, does the owner of the property allow animal fostering? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>If you rent your home, does the owner of the property allow animal fostering? <span className='required'>*</span></legend>
                         <label className='radio-label' for="allowyes">Yes<input id="allowyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAllow(target.value)}
                           type="radio" required name="allow" value={allow} minLength="3" /></label>
                           <label className='radio-label' for="allowno">No<input id="allowno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAllow(target.value)}
                           type="radio" required name="allow" value={allow} minLength="3" /></label>
                           <label className='radio-label' for="allowna">Not Applicable<input id="allowna" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAllow(target.value)}
                           type="radio" required name="allow" value={allow} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Do you or any other individuals smoke inside the home? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Do you or any other individuals smoke inside the home? <span className='required'>*</span></legend>
                         <label className='radio-label' for="smokeyes">Yes<input id="smokeyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setSmoke(target.value)}
                           type="radio" required name="smoke" value={smoke} minLength="3" /></label>
                           <label className='radio-label' for="smokeno">No<input id="smokeno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setSmoke(target.value)}
                           type="radio" required name="smoke" value={smoke} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Do you currently own any pets?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Do you currently own any pets?<span className='required'>*</span></legend>
                         <label className='radio-label' for="yescats">Yes, cat(s)<input id="yescats" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setOtherPets(target.value)}
                           type="radio" required name="otherpets" value={otherpets} minLength="3"  /></label>
                           <label className='radio-label' for="yesdogs">Yes, dog(s)<input id="yesdogs" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setOtherPets(target.value)}
@@ -167,11 +176,13 @@ const FosterApplication = () => {
                           type="radio" required name="otherpets" value={otherpets} minLength="3"  /></label>
                           <label className='radio-label' for="other">Other<input id="other" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setOtherPets(target.value)}
                           type="radio" required name="otherpets" value={otherpets} minLength="3"  /></label>
+                          </fieldset>
                     </div>
 
 
                     <div className=" form-group">
-                        <div className='radio-option'>If you currently own pets, are you able and willing to isolate foster animals from family pets within the home, as required? This includes a mandatory 7 day quarantine period for new fosters.</div>
+                      <fieldset>
+                        <legend className='radio-option'>If you currently own pets, are you able and willing to isolate foster animals from family pets within the home, as required? This includes a mandatory 7 day quarantine period for new fosters.</legend>
                         <div>During the initial quarantine period, the fosterer must notify Bennie's Rescue of any sign of parasite, infection or disease.</div>
                         <label className='radio-label' for="quarantineyes">Yes<input id="quarantineyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setQuarantine(target.value)}
                           type="radio" required name="quarantine" value={quarantine} minLength="3"  /></label>
@@ -179,25 +190,31 @@ const FosterApplication = () => {
                           type="radio" required name="quarantine" value={quarantine} minLength="3"  /></label>
                           <label className='radio-label' for="quarantinena">Not Applicable<input id="quarantinena" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setQuarantine(target.value)}
                           type="radio" required name="quarantine" value={quarantine} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Can you ensure that existing animals in the foster home are spayed or neutered, are up to date on all vaccinations and are free of any known parasites or diseases?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Can you ensure that existing animals in the foster home are spayed or neutered, are up to date on all vaccinations and are free of any known parasites or diseases?<span className='required'>*</span></legend>
                         <label className='radio-label' for="vaccinationsyes">Yes<input id="vaccinationsyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setVaccination(target.value)}
                           type="radio" required name="vaccinations" value={vaccinations} minLength="3"  /></label>
                           <label className='radio-label' for="vaccinationsno">No<input id="vaccinationsno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setVaccination(target.value)}
                           type="radio" required name="vaccinations" value={vaccinations} minLength="3"  /></label>
                           <label className='radio-label' for="vaccinationsna">Not Applicable<input id="vaccinationsna" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setVaccination(target.value)}
                           type="radio" required name="vaccinations" value={vaccinations} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Do you have access to transportation or are you able to advise Bennie's Rescue of any required transportation assistance as soon as it is known?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Do you have access to transportation or are you able to advise Bennie's Rescue of any required transportation assistance as soon as it is known?<span className='required'>*</span></legend>
                         <label className='radio-label' for="transportyes">I have access to a vehicle<input id="transportyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setTransport(target.value)}
                           type="radio" required name="transport" value={transport} minLength="3" /></label>
                           <label className='radio-label' for="transportno">I do not have access to a vehicle, but I will advise Bennie's Rescue of any required transportation assistance as soon as it is know.<input id="transportno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setTransport(target.value)}
                           type="radio" required name="transport" value={transport} minLength="3" /></label>
+                      </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='checkbox-option'>Do you currently share a home with individuals under the age of 18?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='checkbox-option'>Do you currently share a home with individuals under the age of 18?<span className='required'>*</span></legend>
                         <label className='checkbox-label' for="childrenunderfive">Yes, I share a home with individual(s) under 5 years of age<input id="childrenunderfive" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setChildren(target.value)}
                           type="checkbox"  name="children" value={children} minLength="3" /></label>
                           <label className='checkbox-label' for="childrenbetweenfiveandten">Yes, I share a home with indivudual(s) between the ages of 5 and 10<input id="childrenbetweenfiveandten" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setChildren(target.value)}
@@ -206,42 +223,52 @@ const FosterApplication = () => {
                           type="checkbox"  name="children" value={children} minLength="3" /></label>
                           <label className='checkbox-label' for="childrenno">No<input id="childrenno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setChildren(target.value)}
                           type="checkbox"  name="children" value={children} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Do you currently share a home with any other adults?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Do you currently share a home with any other adults?<span className='required'>*</span></legend>
                         <label className='radio-label' for="otheradultsyes">Yes<input id="otheradultsyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAdults(target.value)}
                           type="radio" required name="otheradults" value={otheradults} minLength="3" /></label>
                           <label className='radio-label' for="otheradultsno">No<input id="otheradultsno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAdults(target.value)}
                           type="radio" required name="otheradults" value={otheradults} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Are the other members of the household aware of and do they agree to the commitment involved with fostering?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Are the other members of the household aware of and do they agree to the commitment involved with fostering?<span className='required'>*</span></legend>
                         <label className='radio-label' for="otheradultsawareyes">Yes<input id="otheradultsawareyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAdultsAware(target.value)}
                           type="radio" required name="otheradultsaware" value={otheradultsaware} minLength="3" /></label>
                           <label className='radio-label' for="otheradultsawareno">No<input id="otheradultsawareno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAdultsAware(target.value)}
                           type="radio" required name="otheradultsaware" value={otheradultsaware} minLength="3" /></label>
                           <label className='radio-label' for="otheradultsawarena">Not Applicable<input id="otheradultsawarena" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAdultsAware(target.value)}
                           type="radio" required name="otheradultsaware" value={otheradultsaware} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Are any members of the household allergic to cats?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Are any members of the household allergic to cats?<span className='required'>*</span></legend>
                         <label className='radio-label' for="allergicyes">Yes<input id="allergicyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAllergic(target.value)}
                           type="radio" required name="allergic" value={allergic} minLength="3" /></label>
                           <label className='radio-label' for="allergicno">No<input id="allergicno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAllergic(target.value)}
                           type="radio" required name="allergic" value={allergic} minLength="3" /></label>
                           <label className='radio-label' for="allergicna">Not Applicable<input id="allergicna" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAllergic(target.value)}
                           type="radio" required name="allergic" value={allergic} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Do you have or do you plan on acquiring a litter box, food bowls, a scale that measures grams and ounces/pounds (such as a kitchen scale) and an animal carrier?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Do you have or do you plan on acquiring a litter box, food bowls, a scale that measures grams and ounces/pounds (such as a kitchen scale) and an animal carrier?<span className='required'>*</span></legend>
                         <div>(Bennie's Rescue may provide animal care supplies if available.)</div>
                         <label className='radio-label' for="accessoriesyes">Yes<input id="accessoriesyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAccessories(target.value)}
                           type="radio" required name="accessories" value={accessories} minLength="3"  /></label>
                           <label className='radio-label' for="accessoriesno">No<input id="accessoriesno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAccessories(target.value)}
                           type="radio" required name="accessories" value={accessories} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='checkbox-option'>Do you want to foster adult cats, senior cats, mother cats with kittens, kittens no longer with their mother, or cat(s) requiring special care (socialising or medical care)?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='checkbox-option'>Do you want to foster adult cats, senior cats, mother cats with kittens, kittens no longer with their mother, or cat(s) requiring special care (socialising or medical care)?<span className='required'>*</span></legend>
                         <label className='checkbox-label' for="typeadult">Adult cats<input id="typeadult" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setType(target.value)}
                           type="checkbox"  name="type" value={type} minLength="3" /></label>
                           <label className='checkbox-label' for="typesenior">Senior cats<input id="typesenior" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setType(target.value)}
@@ -254,88 +281,109 @@ const FosterApplication = () => {
                           type="checkbox"  name="type" value={type} minLength="3" /></label>
                           <label className='checkbox-label' for="any">Any of the above<input id="any" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setType(target.value)}
                           type="checkbox"  name="type" value={type} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Do you want to foster animals indefinitely, during "kitten season" or only until you find an animal to adopt?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Do you want to foster animals indefinitely, during "kitten season" or only until you find an animal to adopt?<span className='required'>*</span></legend>
                         <label className='radio-label' for="longterm">Long-Term<input id="longterm" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setLengthType(target.value)}
                           type="radio" required name="lengthtype" value={lengthtype} minLength="3"/></label>
                           <label className='radio-label' for="kittenseason">During "kitten season" (May to October)<input id="kittenseason" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setLengthType(target.value)}
                           type="radio" required name="lengthtype" value={lengthtype} minLength="3"/></label>
                           <label className='radio-label' for="untiladopt">Until I find an animal to adopt<input id="untiladopt" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setLengthType(target.value)}
                           type="radio" required name="lengthtype" value={lengthtype} minLength="3"/></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Are you interested in fostering animals short term (animals necessitating short-term medical treatments requiring quarantine, in emergency situations or new intake animals requiring quarantine - normally 2-3 weeks) or are you interested in fostering animals long term (from intake until adoption - normally 12-16 weeks)?</div>
+                      <fieldset>
+                        <legend className='radio-option'>Are you interested in fostering animals short term (animals necessitating short-term medical treatments requiring quarantine, in emergency situations or new intake animals requiring quarantine - normally 2-3 weeks) or are you interested in fostering animals long term (from intake until adoption - normally 12-16 weeks)?</legend>
                         <label className='radio-label' for="short">Short Term (2-3 weeks)<input id="short" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setShortLong(target.value)}
                           type="radio"  name="shortlong" value={shortlong} minLength="3"  /></label>
                           <label className='radio-label' for="long">Long Term (12-16 weeks)<input id="long" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setShortLong(target.value)}
                           type="radio"  name="shortlong" value={shortlong} minLength="3"  /></label>
                           <label className='radio-label' for="both">Both<input id="both" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setShortLong(target.value)}
                           type="radio"  name="shortlong" value={shortlong} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Do you plan on crating the animal(s) or allowing them to free roam in their designated space?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Do you plan on crating the animal(s) or allowing them to free roam in their designated space?<span className='required'>*</span></legend>
                         <label className='radio-label' for="fulltime">Crating full time<input id="fulltime" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setCrating(target.value)}
                           type="radio" required name="crating" value={crating} minLength="3" /></label>
                           <label className='radio-label' for="nighttime">Crating at night only and allowing free roam during the day<input id="nighttime" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setCrating(target.value)}
                           type="radio" required name="crating" value={crating} minLength="3" /></label>
                           <label className='radio-label' for="roamfree">Allowing free roam at all times (within their designated space in the foster home)<input id="roamfree" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setCrating(target.value)}
                           type="radio" required name="crating" value={crating} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Are you willing and able to socialize and train the animal and advise Bennie's Rescue of any socialization or behavioral issues?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Are you willing and able to socialize and train the animal and advise Bennie's Rescue of any socialization or behavioral issues?<span className='required'>*</span></legend>
                         <div>(This may include litter training, accustomizing the animal to human interaction, etc.)</div>
                         <label className='radio-label' for="socialyes">Yes<input id="socialyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setSocialize(target.value)}
                           type="radio" required name="socialize" value={socialize} minLength="3" /></label>
                           <label className='radio-label' for="socialno">No<input id="socialno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setSocialize(target.value)}
                           type="radio" required name="socialize" value={socialize} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Are you willing and able to provide basic medical attention to the animal if the animal requires the administration of medications or other special medical attention as recommended by a veterinarian?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Are you willing and able to provide basic medical attention to the animal if the animal requires the administration of medications or other special medical attention as recommended by a veterinarian?<span className='required'>*</span></legend>
                         <div>This may include oral medications, eye/ear drops/cleaning, flea medications, or other medical treatments. This does not include veterenarian visits, which are coordinated, handled and paid for by Bennie's Rescue.</div>
                         <label className='radio-label' for="medicalyes">Yes<input id="medicalyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setMedical(target.value)}
                           type="radio" required name="medical" value={medical} minLength="3"  /></label>
                           <label className='radio-label' for="medicalno">No<input id="medicalno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setMedical(target.value)}
                           type="radio" required name="medical" value={medical} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Are you willing and able to be shown how to provide sub cutaneous fluids to the animal?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Are you willing and able to be shown how to provide sub cutaneous fluids to the animal?<span className='required'>*</span></legend>
                         <div>This includes a needle injection under the animal's skin. (If you are not comfortable with this, we will provide you with a foster animal who does not require sub cutaneous fluids.)</div>
                         <label className='radio-label' for="medicalassistyes">Yes<input id="medicalassistyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setMedicalAssist(target.value)}
                           type="radio" required name="medicalassist" value={medicalassist} minLength="3"  /></label>
                           <label className='radio-label' for="medicalassistno">No<input id="medicalassistno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setMedicalAssist(target.value)}
                           type="radio" required name="medicalassist" value={medicalassist} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Are you willing and able to weigh the animal using a scale such as a kitchen scale) if requested by Bennie's Rescue?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Are you willing and able to weigh the animal using a scale such as a kitchen scale) if requested by Bennie's Rescue?<span className='required'>*</span></legend>
                         <div> If fostering kittens, the fosterer must weigh the kittens using a small animal or kitchen scale and must record each kitten’s weight on a daily basis for the first 4 weeks of life, and then on a weekly basis thereafter. The fosterer must provide weights for all kittens or cats in their care to Bennie's Rescue upon request.</div>
                         <label className='radio-label' for="scaleyes">Yes<input id="scaleyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setScale(target.value)}
                           type="radio" required name="scale" value={scale} minLength="3" /></label>
                           <label className='radio-label' for="scaleno">No<input id="scaleno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setScale(target.value)}
                           type="radio" required name="scale" value={scale} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Do you currently foster animals for any other rescue organisation or do you plan to during the time period you would be fostering for Bennie's Rescue?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Do you currently foster animals for any other rescue organisation or do you plan to during the time period you would be fostering for Bennie's Rescue?<span className='required'>*</span></legend>
                         <label className='radio-label' for="otherfosteryes">Yes<input id="otherfosteryes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setOtherFoster(target.value)}
                           type="radio" required name="otherfoster" value={otherfoster} minLength="3" /></label>
                           <label className='radio-label' for="otherfosterno">No<input id="otherfosterno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setOtherFoster(target.value)}
                           type="radio" required name="otherfoster" value={otherfoster} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Has any member of the household been convicted of an animal welfare law violation such as neglect, cruelty or abandonment, or any other charge related to animal welfare?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Has any member of the household been convicted of an animal welfare law violation such as neglect, cruelty or abandonment, or any other charge related to animal welfare?<span className='required'>*</span></legend>
                         <label className='radio-label' for="welfareyes">Yes<input id="welfareyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setWelfare(target.value)}
                           type="radio" required name="welfare" value={welfare} minLength="3"/></label>
                           <label className='radio-label' for="welfareno">No<input id="welfareno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setWelfare(target.value)}
                           type="radio" required name="welfare" value={welfare} minLength="3"/></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Are you willing and able to take a foster animal into your home with 48 hours notice?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Are you willing and able to take a foster animal into your home with 48 hours notice?<span className='required'>*</span></legend>
                         <label className='radio-label' for="shortnoticeyes">Yes<input id="shortnoticeyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setShortNotice(target.value)}
                           type="radio" required name="shortnotice" value={shortnotice} minLength="3" /></label>
                           <label className='radio-label' for="shortnoticeno">No<input id="shortnoticeno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setShortNotice(target.value)}
                           type="radio" required name="shortnotice" value={shortnotice} minLength="3" /></label>
                           <label className='radio-label' for="shortnoticebut">No, but I will be ready to take a foster animal on a specific date.<input id="shortnoticebut" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setShortNotice(target.value)}
                           type="radio" required name="shortnotice" value={shortnotice} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
                         <label for="date">If you are not willing or able to take a foster animal into your home within 48 hours, what is the delay you need to take in a foster animal?</label>
@@ -343,11 +391,13 @@ const FosterApplication = () => {
                           type="date"  name="date" value={date} minLength="3"  />
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Do you understand and acknowledge that Bennie's Rescue cannot and does not make any guarantees as to the health, temperament, mental disposition, and training of rescued animals, and that fostering animal(s) is at your own risk?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Do you understand and acknowledge that Bennie's Rescue cannot and does not make any guarantees as to the health, temperament, mental disposition, and training of rescued animals, and that fostering animal(s) is at your own risk?<span className='required'>*</span></legend>
                         <label className='radio-label' for="acknowledgeyes">Yes<input id="acknowledgeyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAcknowledge(target.value)}
                           type="radio" required name="acknowledge" value={acknowledge} minLength="3"  /></label>
                           <label className='radio-label' for="acknowledgeno">No<input id="acknowledgeno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAcknowledge(target.value)}
                           type="radio" required name="acknowledge" value={acknowledge} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className="form-group">
                         <label for="message">Do you have any questions about fostering for Bennie's Rescue? </label>
diff --git a/src/pages/fosters/foster-application.fr.js b/src/pages/fosters/foster-application.fr.js
index 592158a..8a25c36 100644
--- a/src/pages/fosters/foster-application.fr.js
+++ b/src/pages/fosters/foster-application.fr.js
@@ -44,7 +44,7 @@ const FosterApplication = () => {
     e.preventDefault()
     const myForm = e.target;
     const formData = new FormData(myForm);
-    fetch("/", {
+    fetch("/foster-application.fr.js", {
         method: "POST",
         headers: { "Content-Type": "application/x-www-form-urlencoded" },
         body: new URLSearchParams(formData).toString(),
@@ -89,12 +89,12 @@ const FosterApplication = () => {
 };
   return (
     <main>
-      <Header page='en/fosters/foster-application'/>
+      <Header page='/en/fosters/foster-application'/>
       <div className="container">
             <h1>Damille D'Accueil Application</h1>
-            <form className='foster-application-form' name="contact" method="post" data-netlify="true" data-netlify-honeypot="bot-field"
-              onSubmit={handleSubmit} id="contact-form">
-                <input type="hidden" name="form-name" value="contact" />
+            <form className='foster-application-form' name="foster-application-fr" method="post" data-netlify="true" data-netlify-honeypot="bot-field"
+              onSubmit={handleSubmit} id="foster-application-fr">
+                <input type="hidden" name="form-name" value="foster-application-fr" />
                 <input type="hidden" name="bot-field" />
                 <div className="row clearfix">
                     <div className="form-group">
@@ -109,11 +109,13 @@ const FosterApplication = () => {
                           type="text" required name="name" value={name} minLength="3" placeholder="Votre Réponse" />
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Avez-vous 18 ans ou plus?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Avez-vous 18 ans ou plus?<span className='required'>*</span></legend>
                         <label className='radio-label' for="ageyes">Oui<input id="ageyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAge(target.value)}
                           type="radio" required name="age" value={age} minLength="3"  /></label>
                           <label  className='radio-label' for="ageno">Non<input id='ageno' className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAge(target.value)}
                           type="radio" required name="age" value={age} minLength="3"  /></label>
+                      </fieldset>
                     </div>
                     <div className=" form-group">
                         <label for="phone">Numéro de téléphone<span className='required'>*</span></label>
@@ -131,30 +133,37 @@ const FosterApplication = () => {
                           type="text" required name="why" value={why} minLength="3" placeholder="Votre Réponse" />
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Êtes-vous propriétaire ou locataire de votre maison? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Êtes-vous propriétaire ou locataire de votre maison? <span className='required'>*</span></legend>
                         <label for="homerent" className='radio-label'>Louer<input id="homerent" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setHome(target.value)}
                           type="radio" required name="home" value={home} minLength="3" /></label>
                           <label for="homeown" className='radio-label'>Propre<input id="homeown" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setHome(target.value)}
                           type="radio" required name="home" value={home} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Si vous louez votre logement, le propriétaire du bien autorise-t-il l'accueil d'animaux ? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Si vous louez votre logement, le propriétaire du bien autorise-t-il l'accueil d'animaux ? <span className='required'>*</span></legend>
                         <label className='radio-label' for="allowyes">Oui<input id="allowyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAllow(target.value)}
                           type="radio" required name="allow" value={allow} minLength="3" /></label>
                           <label className='radio-label' for="allowno">Non<input id="allowno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAllow(target.value)}
                           type="radio" required name="allow" value={allow} minLength="3" /></label>
                           <label className='radio-label' for="allowna">Non Applicable<input id="allowna" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAllow(target.value)}
                           type="radio" required name="allow" value={allow} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Est-ce que vous ou d’autres personnes fumez à l’intérieur de la maison ? <span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Est-ce que vous ou d’autres personnes fumez à l’intérieur de la maison ? <span className='required'>*</span></legend>
                         <label className='radio-label' for="smokeyes">Oui<input id="smokeyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setSmoke(target.value)}
                           type="radio" required name="smoke" value={smoke} minLength="3" /></label>
                           <label className='radio-label' for="smokeno">Non<input id="smokeno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setSmoke(target.value)}
                           type="radio" required name="smoke" value={smoke} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Possédez-vous actuellement des animaux de compagnie ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Possédez-vous actuellement des animaux de compagnie ?<span className='required'>*</span></legend>
                         <label className='radio-label' for="yescats">Oui, chat(s)<input id="yescats" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setOtherPets(target.value)}
                           type="radio" required name="otherpets" value={otherpets} minLength="3"  /></label>
                           <label className='radio-label' for="yesdogs">Oui, chien(s)<input id="yesdogs" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setOtherPets(target.value)}
@@ -165,11 +174,13 @@ const FosterApplication = () => {
                           type="radio" required name="otherpets" value={otherpets} minLength="3"  /></label>
                           <label className='radio-label' for="other">Autre<input id="other" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setOtherPets(target.value)}
                           type="radio" required name="otherpets" value={otherpets} minLength="3"  /></label>
+                          </fieldset>
                     </div>
 
 
                     <div className=" form-group">
-                        <div className='radio-option'>Si vous possédez actuellement des animaux de compagnie, êtes-vous en mesure et disposé à isoler les animaux d'accueil des animaux de compagnie de la famille au sein du foyer, comme requis ? Cela comprend une période de quarantaine obligatoire de 7 jours pour les nouveaux animaux d'accueil.</div>
+                      <fieldset>
+                        <legend className='radio-option'>Si vous possédez actuellement des animaux de compagnie, êtes-vous en mesure et disposé à isoler les animaux d'accueil des animaux de compagnie de la famille au sein du foyer, comme requis ? Cela comprend une période de quarantaine obligatoire de 7 jours pour les nouveaux animaux d'accueil.</legend>
                         <div>Pendant la période de quarantaine initiale, le parent d'accueil doit informer Sauvetage Bennie's de tout signe de parasite, d'infection ou de maladie.</div>
                         <label className='radio-label' for="quarantineyes">Yes<input id="quarantineyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setQuarantine(target.value)}
                           type="radio" required name="quarantine" value={quarantine} minLength="3"  /></label>
@@ -177,25 +188,31 @@ const FosterApplication = () => {
                           type="radio" required name="quarantine" value={quarantine} minLength="3"  /></label>
                           <label className='radio-label' for="quarantinena">Not Applicable<input id="quarantinena" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setQuarantine(target.value)}
                           type="radio" required name="quarantine" value={quarantine} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Pouvez-vous garantir que les animaux présents dans le foyer d'accueil sont stérilisés, à jour de tous leurs vaccins et exempts de tout parasite ou maladie connu ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Pouvez-vous garantir que les animaux présents dans le foyer d'accueil sont stérilisés, à jour de tous leurs vaccins et exempts de tout parasite ou maladie connu ?<span className='required'>*</span></legend>
                         <label className='radio-label' for="vaccinationsyes">Oui<input id="vaccinationsyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setVaccination(target.value)}
                           type="radio" required name="vaccinations" value={vaccinations} minLength="3"  /></label>
                           <label className='radio-label' for="vaccinationsno">Non<input id="vaccinationsno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setVaccination(target.value)}
                           type="radio" required name="vaccinations" value={vaccinations} minLength="3"  /></label>
                           <label className='radio-label' for="vaccinationsna">Non Applicable<input id="vaccinationsna" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setVaccination(target.value)}
                           type="radio" required name="vaccinations" value={vaccinations} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Avez-vous accès à un moyen de transport ou êtes-vous en mesure d'informer Sauvetage Bennie's de toute assistance en matière de transport requise dès qu'elle est connue ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Avez-vous accès à un moyen de transport ou êtes-vous en mesure d'informer Sauvetage Bennie's de toute assistance en matière de transport requise dès qu'elle est connue ?<span className='required'>*</span></legend>
                         <label className='radio-label' for="transportyes">J'ai accès à un véhicule<input id="transportyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setTranport(target.value)}
                           type="radio" required name="transport" value={transport} minLength="3" /></label>
                           <label className='radio-label' for="transportno">Je n'ai pas accès à un véhicule, mais j'informerai Sauvetage Bennie's de toute assistance de transport requise dès que je le saurai.<input id="transportno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setTranport(target.value)}
                           type="radio" required name="transport" value={transport} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='checkbox-option'>Partagez-vous actuellement un logement avec des personnes de moins de 18 ans ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='checkbox-option'>Partagez-vous actuellement un logement avec des personnes de moins de 18 ans ?<span className='required'>*</span></legend>
                         <label className='checkbox-label' for="childrenunderfive">Oui, je partage un logement avec une ou plusieurs personnes de moins de 5 ans<input id="childrenyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setChildren(target.value)}
                           type="checkbox"  name="children" value={children} minLength="3" /></label>
                           <label className='checkbox-label' for="childrenbetweenfiveandten">Oui, je partage un logement avec des personnes âgées de 5 à 10 ans<input id="childrenbetweenfiveandten" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setChildren(target.value)}
@@ -204,42 +221,52 @@ const FosterApplication = () => {
                           type="checkbox"  name="children" value={children} minLength="3" /></label>
                           <label className='checkbox-label' for="childrenno">Non<input id="childrenno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setChildren(target.value)}
                           type="checkbox"  name="children" value={children} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Partagez-vous actuellement un logement avec d’autres adultes ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Partagez-vous actuellement un logement avec d’autres adultes ?<span className='required'>*</span></legend>
                         <label className='radio-label' for="otheradultsyes">Oui<input id="otheradultsyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAdults(target.value)}
                           type="radio" required name="otheradults" value={otheradults} minLength="3" /></label>
                           <label className='radio-label' for="otheradultsno">Non<input id="otheradultsno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAdults(target.value)}
                           type="radio" required name="otheradults" value={otheradults} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Les autres membres du foyer sont-ils conscients et acceptent-ils l’engagement qu’implique le fait d’être parent d’accueil ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Les autres membres du foyer sont-ils conscients et acceptent-ils l’engagement qu’implique le fait d’être parent d’accueil ?<span className='required'>*</span></legend>
                         <label className='radio-label' for="otheradultsawareyes">Oui<input id="otheradultsawareyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAdultsAware(target.value)}
                           type="radio" required name="otheradultsaware" value={otheradultsaware} minLength="3" /></label>
                           <label className='radio-label' for="otheradultsawareno">Non<input id="otheradultsawareno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAdultsAware(target.value)}
                           type="radio" required name="otheradultsaware" value={otheradultsaware} minLength="3" /></label>
                           <label className='radio-label' for="otheradultsawarena">Non Applicable<input id="otheradultsawarena" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAdultsAware(target.value)}
                           type="radio" required name="otheradultsaware" value={otheradultsaware} minLength="3" /></label>
+                      </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Y a-t-il des membres de la famille allergiques aux chats ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Y a-t-il des membres de la famille allergiques aux chats ?<span className='required'>*</span></legend>
                         <label className='radio-label' for="allergicyes">Oui<input id="allergicyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAllergic(target.value)}
                           type="radio" required name="allergic" value={allergic} minLength="3" /></label>
                           <label className='radio-label' for="allergicno">Non<input id="allergicno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAllergic(target.value)}
                           type="radio" required name="allergic" value={allergic} minLength="3" /></label>
                           <label className='radio-label' for="allergicna">Non Applicable<input id="allergicna" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAllergic(target.value)}
                           type="radio" required name="allergic" value={allergic} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Avez-vous ou prévoyez-vous acquérir un bac à litière, des bols de nourriture, une balance qui mesure les grammes et les onces/livres (comme une balance de cuisine) et un sac de transport pour animaux ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Avez-vous ou prévoyez-vous acquérir un bac à litière, des bols de nourriture, une balance qui mesure les grammes et les onces/livres (comme une balance de cuisine) et un sac de transport pour animaux ?<span className='required'>*</span></legend>
                         <div>(Sauvetage Bennie's peut fournir des fournitures de soins aux animaux si disponibles.)</div>
                         <label className='radio-label' for="accessoriesyes">Oui<input id="accessoriesyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAccessories(target.value)}
                           type="radio" required name="accessories" value={accessories} minLength="3"  /></label>
                           <label className='radio-label' for="accessoriesno">Non<input id="accessoriesno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAccessories(target.value)}
                           type="radio" required name="accessories" value={accessories} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='checkbox-option'>Vous souhaitez accueillir des chats adultes, des chats seniors, des chattes avec des chatons, des chatons qui ne sont plus avec leur mère, ou un ou plusieurs chats nécessitant des soins particuliers (socialisation ou soins médicaux) ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='checkbox-option'>Vous souhaitez accueillir des chats adultes, des chats seniors, des chattes avec des chatons, des chatons qui ne sont plus avec leur mère, ou un ou plusieurs chats nécessitant des soins particuliers (socialisation ou soins médicaux) ?<span className='required'>*</span></legend>
                         <label className='checkbox-label' for="typeadult">Chats adultes<input id="typeadult" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setType(target.value)}
                           type="checkbox"  name="type" value={type} minLength="3" /></label>
                           <label className='checkbox-label' for="typesenior">Chats âgés<input id="typeseniot" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setType(target.value)}
@@ -252,88 +279,109 @@ const FosterApplication = () => {
                           type="checkbox"  name="type" value={type} minLength="3" /></label>
                           <label className='checkbox-label' for="any">L'un des éléments ci-dessus<input id="any" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setType(target.value)}
                           type="checkbox"  name="type" value={type} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Souhaitez-vous accueillir des animaux de façon indéfinie, pendant la « saison des chatons » ou seulement jusqu'à ce que vous trouviez un animal à adopter ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Souhaitez-vous accueillir des animaux de façon indéfinie, pendant la « saison des chatons » ou seulement jusqu'à ce que vous trouviez un animal à adopter ?<span className='required'>*</span></legend>
                         <label className='radio-label' for="longterm">À long terme<input id="longterm" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setLengthType(target.value)}
                           type="radio" required name="lengthtype" value={lengthtype} minLength="3"/></label>
                           <label className='radio-label' for="kittenseason">Pendant la « saison des chatons » (de mai à octobre)<input id="kittenseason" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setLengthType(target.value)}
                           type="radio" required name="lengthtype" value={lengthtype} minLength="3"/></label>
                           <label className='radio-label' for="untiladopt">En attendant de trouver un animal à adopter<input id="untiladopt" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setLengthType(target.value)}
                           type="radio" required name="lengthtype" value={lengthtype} minLength="3"/></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Êtes-vous intéressé à accueillir des animaux à court terme (animaux nécessitant des traitements médicaux à court terme nécessitant une quarantaine, dans des situations d'urgence ou de nouveaux animaux admis nécessitant une quarantaine - normalement 2 à 3 semaines) ou êtes-vous intéressé à accueillir des animaux à long terme (de l'admission jusqu'à l'adoption - normalement 12 à 16 semaines) ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Êtes-vous intéressé à accueillir des animaux à court terme (animaux nécessitant des traitements médicaux à court terme nécessitant une quarantaine, dans des situations d'urgence ou de nouveaux animaux admis nécessitant une quarantaine - normalement 2 à 3 semaines) ou êtes-vous intéressé à accueillir des animaux à long terme (de l'admission jusqu'à l'adoption - normalement 12 à 16 semaines) ?<span className='required'>*</span></legend>
                         <label className='radio-label' for="short">Court terme (2-3 semaines)<input id="short" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setShortLong(target.value)}
                           type="radio" required name="shortlong" value={shortlong} minLength="3"  /></label>
                           <label className='radio-label' for="long">Long terme (12-16 semaines)<input id="long" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setShortLong(target.value)}
                           type="radio" required name="shortlong" value={shortlong} minLength="3"  /></label>
                           <label className='radio-label' for="both">Les deux<input id="both" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setShortLong(target.value)}
                           type="radio" required name="shortlong" value={shortlong} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Prévoyez-vous de créer les animaux) ou de les laisser se déplacer librement dans l'espace qui leur est désigné ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Prévoyez-vous de créer les animaux) ou de les laisser se déplacer librement dans l'espace qui leur est désigné ?<span className='required'>*</span></legend>
                         <label className='radio-label' for="fulltime">Mise en caisse à temps plein<input id="fulltime" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setCrating(target.value)}
                           type="radio" required name="crating" value={crating} minLength="3" /></label>
                           <label className='radio-label' for="nighttime">Mise en cage la nuit uniquement et libre circulation pendant la journée<input id="nighttime" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setCrating(target.value)}
                           type="radio" required name="crating" value={crating} minLength="3" /></label>
                           <label className='radio-label' for="roamfree">Permettre aux animaux de se déplacer librement à tout moment (dans l'espace qui leur est attribué dans le foyer d'accueil)<input id="roamfree" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setCrating(target.value)}
                           type="radio" required name="crating" value={crating} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Êtes-vous disposé et capable de socialiser et de dresser l'animal et d'informer Sauvetage Bennie's de tout problème de socialisation ou de comportement ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Êtes-vous disposé et capable de socialiser et de dresser l'animal et d'informer Sauvetage Bennie's de tout problème de socialisation ou de comportement ?<span className='required'>*</span></legend>
                         <div>(Cela peut inclure l’apprentissage de la litière, l’accoutumance de l’animal à l’interaction humaine, etc.)</div>
                         <label className='radio-label' for="socialyes">Oui<input id="socialyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setSocialize(target.value)}
                           type="radio" required name="socialize" value={socialize} minLength="3" /></label>
                           <label className='radio-label' for="socialno">Non<input id="socialno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setSocialize(target.value)}
                           type="radio" required name="socialize" value={socialize} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Êtes-vous disposé et capable de fournir des soins médicaux de base à l’animal si celui-ci nécessite l’administration de médicaments ou d’autres soins médicaux particuliers recommandés par un vétérinaire ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Êtes-vous disposé et capable de fournir des soins médicaux de base à l’animal si celui-ci nécessite l’administration de médicaments ou d’autres soins médicaux particuliers recommandés par un vétérinaire ?<span className='required'>*</span></legend>
                         <div>Cela peut inclure des médicaments par voie orale, des gouttes/nettoyages pour les yeux/oreilles, des médicaments contre les puces ou d'autres traitements médicaux. Cela n'inclut pas les visites chez le vétérinaire, qui sont coordonnées, gérées et payées par Sauvetage Bennie's.</div>
                         <label className='radio-label' for="medicalyes">Oui<input id="medicalyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setMedical(target.value)}
                           type="radio" required name="medical" value={medical} minLength="3"  /></label>
                           <label className='radio-label' for="medicalno">Non<input id="medicalno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setMedical(target.value)}
                           type="radio" required name="medical" value={medical} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Êtes-vous disposé et capable de voir comment fournir des liquides sous-cutanés à l'animal ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Êtes-vous disposé et capable de voir comment fournir des liquides sous-cutanés à l'animal ?<span className='required'>*</span></legend>
                         <div>Cela comprend une injection à l'aiguille sous la peau de l'animal. (Si vous n'êtes pas à l'aise avec cette méthode, nous vous fournirons un animal d'accueil qui n'a pas besoin de fluides sous-cutanés.)</div>
                         <label className='radio-label' for="medicalassistyes">Oui<input id="medicalassistyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setMedicalAssist(target.value)}
                           type="radio" required name="medicalassist" value={medicalassist} minLength="3"  /></label>
                           <label className='radio-label' for="medicalassistno">Non<input id="medicalassistno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setMedicalAssist(target.value)}
                           type="radio" required name="medicalassist" value={medicalassist} minLength="3"  /></label>
+                    </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Êtes-vous disposé et capable de peser l'animal à l'aide d'une balance telle qu'une balance de cuisine) si Sauvetage Bennie's le demande ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Êtes-vous disposé et capable de peser l'animal à l'aide d'une balance telle qu'une balance de cuisine) si Sauvetage Bennie's le demande ?<span className='required'>*</span></legend>
                         <div>Si vous accueillez des chatons, le parent d'accueil doit les peser à l'aide d'une petite balance pour animaux ou d'une balance de cuisine et doit enregistrer le poids de chaque chaton quotidiennement pendant les 4 premières semaines de vie, puis chaque semaine par la suite. Le parent d'accueil doit fournir le poids de tous les chatons ou chats dont il a la garde au Sauvetage Bennie's sur demande.</div>
                         <label className='radio-label' for="scaleyes">Oui<input id="scaleyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setScale(target.value)}
                           type="radio" required name="scale" value={scale} minLength="3" /></label>
                           <label className='radio-label' for="scaleno">Non<input id="scaleno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setScale(target.value)}
                           type="radio" required name="scale" value={scale} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Accueillez-vous actuellement des animaux pour une autre organisation de sauvetage ou prévoyez-vous de le faire pendant la période où vous accueilleriez des animaux pour Sauvetage Bennie's?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Accueillez-vous actuellement des animaux pour une autre organisation de sauvetage ou prévoyez-vous de le faire pendant la période où vous accueilleriez des animaux pour Sauvetage Bennie's?<span className='required'>*</span></legend>
                         <label className='radio-label' for="otherfosteryes">Oui<input id="otherfosteryes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setOtherFoster(target.value)}
                           type="radio" required name="otherfoster" value={otherfoster} minLength="3" /></label>
                           <label className='radio-label' for="otherfosterno">Non<input id="otherfosterno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setOtherFoster(target.value)}
                           type="radio" required name="otherfoster" value={otherfoster} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Un membre du ménage a-t-il été reconnu coupable d’une violation de la loi sur le bien-être animal, comme la négligence, la cruauté ou l’abandon, ou de toute autre accusation liée au bien-être animal ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Un membre du ménage a-t-il été reconnu coupable d’une violation de la loi sur le bien-être animal, comme la négligence, la cruauté ou l’abandon, ou de toute autre accusation liée au bien-être animal ?<span className='required'>*</span></legend>
                         <label className='radio-label' for="welfareyes">Oui<input id="welfareyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setWelfare(target.value)}
                           type="radio" required name="welfare" value={welfare} minLength="3"/></label>
                           <label className='radio-label' for="welfareno">Non<input id="welfareno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setWelfare(target.value)}
                           type="radio" required name="welfare" value={welfare} minLength="3"/></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Êtes-vous prêt et capable d'accueillir un animal en famille d'accueil chez vous avec un préavis de 48 heures ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Êtes-vous prêt et capable d'accueillir un animal en famille d'accueil chez vous avec un préavis de 48 heures ?<span className='required'>*</span></legend>
                         <label className='radio-label' for="shortnoticeyes">Oui<input id="shortnoticeyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setShortNotice(target.value)}
                           type="radio" required name="shortnotice" value={shortnotice} minLength="3" /></label>
                           <label className='radio-label' for="shortnoticeno">Non<input id="shortnoticeno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setShortNotice(target.value)}
                           type="radio" required name="shortnotice" value={shortnotice} minLength="3" /></label>
                           <label className='radio-label' for="shortnoticebut">Non, mais je serai prêt à accueillir un animal en famille d'accueil à une date précise.<input id="shortnoticebut" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setShortNotice(target.value)}
                           type="radio" required name="shortnotice" value={shortnotice} minLength="3" /></label>
+                          </fieldset>
                     </div>
                     <div className=" form-group">
                         <label>Si vous n'êtes pas disposé ou en mesure d'accueillir un animal en famille d'accueil dans votre foyer dans les 48 heures, quel est le délai dont vous avez besoin pour accueillir un animal en famille d'accueil ?<span className='required'>*</span></label>
@@ -341,11 +389,13 @@ const FosterApplication = () => {
                           type="date" required name="date" value={date} minLength="3"  />
                     </div>
                     <div className=" form-group">
-                        <div className='radio-option'>Comprenez-vous et reconnaissez-vous que Bennie's Rescue ne peut pas et ne donne aucune garantie quant à la santé, au tempérament, à la disposition mentale et à la formation des animaux sauvés, et que l'accueil d'animaux se fait à vos propres risques ?<span className='required'>*</span></div>
+                      <fieldset>
+                        <legend className='radio-option'>Comprenez-vous et reconnaissez-vous que Bennie's Rescue ne peut pas et ne donne aucune garantie quant à la santé, au tempérament, à la disposition mentale et à la formation des animaux sauvés, et que l'accueil d'animaux se fait à vos propres risques ?<span className='required'>*</span></legend>
                         <label className='radio-label' for="acknowledgeyes">Oui<input id="acknowledgeyes" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAcknowledge(target.value)}
                           type="radio" required name="acknowledge" value={acknowledge} minLength="3"  /></label>
                           <label className='radio-label' for="acknowledgeno">Non<input id="acknowledgeno" className='col-9 col-sm-10 col-md-11' onChange={({ target }) => setAcknowledge(target.value)}
                           type="radio" required name="acknowledge" value={acknowledge} minLength="3"  /></label>
+                          </fieldset>
                     </div>
                     <div className="form-group">
                         <label>Do you have any questions about fostering for Bennie's Rescue? <span className='required'>*</span></label>
diff --git a/src/sass/pages/adoptions.scss b/src/sass/pages/adoptions.scss
index 330e70b..86e5128 100644
--- a/src/sass/pages/adoptions.scss
+++ b/src/sass/pages/adoptions.scss
@@ -1,4 +1,11 @@
 .adoptions-template {
+    padding-bottom: 40px;
+    @media(min-width: 768px) {
+        padding-bottom: 80px;
+    }
+    @media(min-width: 1024px) {
+        padding-bottom: 100px;
+    }
     img {
         padding: 10px 0;
         // max-height: 251px;
diff --git a/src/sass/pages/forms.scss b/src/sass/pages/forms.scss
index 7c7ab7b..2289375 100644
--- a/src/sass/pages/forms.scss
+++ b/src/sass/pages/forms.scss
@@ -1,7 +1,9 @@
 
     .contact-us-form,
     .adoption-application-form,
-    .foster-application-form {
+    .foster-application-form,
+    .adoption-application-fr,
+    .foster-application-fr {
         padding-bottom: 40px;
         .required {
             color: red;
diff --git a/src/templates/adoptions.js b/src/templates/adoptions.js
index 8cee8ad..2a25db5 100644
--- a/src/templates/adoptions.js
+++ b/src/templates/adoptions.js
@@ -50,6 +50,10 @@ const AdoptionsTemplate = ({data}) => {
                   
                 })}
                 <div className="description">{renderRichText(data.allContentfulAdoptions.edges[0].node.description, options)}</div>
+            
+            <div className="application-button">
+              <a href="/en/adoption/adoption-application"className="application-btn btn btn-primary btn-header">Soumettre une demande</a>
+            </div>
             </div>
         </div>
         <section className='foster'>
diff --git a/src/templates/fr/adoptions.js b/src/templates/fr/adoptions.js
index c7e3100..2eaa955 100644
--- a/src/templates/fr/adoptions.js
+++ b/src/templates/fr/adoptions.js
@@ -51,6 +51,10 @@ const AdoptionsTemplateFR = ({data}) => {
                 })}
                 
                 <div className="description">{renderRichText(data.allContentfulAdoptions.edges[0].node.description, options)}</div>
+            
+            <div className="application-button">
+              <a href="/fr/adoption/adoption-application"className="application-btn btn btn-primary btn-header">Soumettre une demande</a>
+            </div>
             </div>
         </div>
     <section className='foster'>