diff --git a/content/contacta.ca.md b/content/contacta.ca.md
index dea0642..10be4bb 100644
--- a/content/contacta.ca.md
+++ b/content/contacta.ca.md
@@ -6,22 +6,15 @@ menu:
     weight: 6
     url: "/contacta/"
 ---
-Pàgina no disponible temporalment. Disculpeu les molèsties.
+Si necessiteu ajuda, teniu suggeriments o trobeu errors mentre feu servir amb els nostres continguts a l’openBVE, podeu escriure un missatge aquí i ho intentarem resoldre el més aviat possible.
 
-<form name="contact" action="#" netlify>
-  <p hidden>
-    <label>Don’t fill this out: <input type="text" name="bot-field"/>
-  <p>
-  <p>
-    <label>Nom: <input type="text" name="name"></label>   
-  </p>
-  <p>
-    <label>Correu electrònic: <input type="email" name="email"></label>
-  </p>
-  <p>
-    <label>Missatge: <textarea name="message"></textarea></label>
-  </p>
-  <p>
-    <button type="submit">Envia</button>
-  </p>
+<form name="contact" netlify-honeypot="bot-field" netlify>
+  <p hidden><label>Don’t fill this out: <input type="text" name="bot-field"/></p>
+  <label>Nom</label>
+  <input type="text" name="name" required>
+  <label>Correu electrònic</label>
+  <input type="email" name="email" required>
+  <label>Missatge</label>
+  <textarea name="message" required></textarea>
+  <button type="submit">Envia</button>
 </form>
diff --git a/content/contacta.en.md b/content/contacta.en.md
index 23f954c..4098b00 100644
--- a/content/contacta.en.md
+++ b/content/contacta.en.md
@@ -7,4 +7,15 @@ menu:
     weight: 6
     url: "/contact/"
 ---
-This page is temporarily unavailable. Sorry for the inconvenience.
+If you need help, have a suggestion or have found errors while using our openBVE contents, leave a message here and we will try to find a solution as soon as possible.
+
+<form name="contact" netlify-honeypot="bot-field" netlify>
+  <p hidden><label>Don’t fill this out: <input type="text" name="bot-field"/></p>
+  <label>Name</label>
+  <input type="text" name="name" required>
+  <label>Email</label>
+  <input type="email" name="email" required>
+  <label>Message</label>
+  <textarea name="message" required></textarea>
+  <button type="submit">Send</button>
+</form>
diff --git a/content/contacta.es.md b/content/contacta.es.md
index 98de7b0..17774bb 100644
--- a/content/contacta.es.md
+++ b/content/contacta.es.md
@@ -7,4 +7,15 @@ menu:
     weight: 6
     url: "/contacto/"
 ---
-Página no disponible temporalmente. Disculpa las molestias.
+Si necessitas ayuda, tienes sugerencias o has encontrado algún error usando nuestros contenidos para openBVE, puedes escribir un mensaje aquí e intentaremos resolverlo lo antes posible.
+
+<form name="contact" netlify-honeypot="bot-field" netlify>
+  <p hidden><label>Don’t fill this out: <input type="text" name="bot-field"/></p>
+  <label>Nombre</label>
+  <input type="text" name="name" required>
+  <label>Correo electrónico</label>
+  <input type="email" name="email" required>
+  <label>Mensaje</label>
+  <textarea name="message" required></textarea>
+  <button type="submit">Enviar</button>
+</form>
diff --git a/content/missatge-enviat.ca.md b/content/missatge-enviat.ca.md
deleted file mode 100644
index 35108cd..0000000
--- a/content/missatge-enviat.ca.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: "Missatge enviat"
----
-S'ha enviat correctament el vostre missatge. Moltes gràcies!
diff --git a/themes/crab/static/css/crab.css b/themes/crab/static/css/crab.css
index fbe8dd1..1af002e 100644
--- a/themes/crab/static/css/crab.css
+++ b/themes/crab/static/css/crab.css
@@ -308,6 +308,25 @@ table img {
   color: #208DCC;
 }
 
+form label {
+  display: block;
+}
+
+form textarea,
+form input {
+  margin-top: 10px;
+  margin-bottom: 20px;
+  width: 100%;
+  display: block;
+  box-sizing: border-box;
+}
+
+form textarea {
+  height: 160px;
+  width: 100%;
+  resize: none;
+}
+
 @media screen and (max-width: 699px) {
 #site-logo {
   display: block;