diff --git a/main.go b/main.go
index b06a6db..f6979c1 100644
--- a/main.go
+++ b/main.go
@@ -23,7 +23,7 @@ func main() {
 	mux.HandleFunc("/search/", server.DisplayResults(db))
 	mux.HandleFunc("/new-briefing/", server.DisplayForm(&i))
 	mux.HandleFunc("/add-participant/", server.AddParticipant(&i))
-	mux.HandleFunc("/submit/", server.SubmitForm(db, &i, &j))
+	mux.HandleFunc("/submit-form/", server.SubmitForm(db, &i, &j))
 
 	log.Fatalln(http.ListenAndServe(":8080", mux))
 }
diff --git a/templates/form.html b/templates/form.html
index 19d147d..2f36906 100644
--- a/templates/form.html
+++ b/templates/form.html
@@ -49,7 +49,7 @@
     {{ template "participant" . }}
   </div>
 
-  <button type="submit" hx-post="/submit/" hx-target="#content" hx-swap="innerHTML">
+  <button type="submit" hx-post="/submit-form/" hx-target="#content" hx-swap="innerHTML">
     Senden
   </button>
 </form>
diff --git a/templates/question.html b/templates/question.html
new file mode 100644
index 0000000..e155c95
--- /dev/null
+++ b/templates/question.html
@@ -0,0 +1,14 @@
+{{ define "question" }}
+<div id="question-{{ .QuestionNumber }}">
+  <h2>Frage {{ .QuestionNumber }}
+    <p>{{ .Question }}</p
+  <label for="participant-first-input-{{ . }}">Vorname</label>
+  <input type="text" name="participant-first-{{ . }}" id="participant-first-input-{{ . }}" />
+
+  <label for="participant-last-input-{{ . }}">Nachname</label>
+  <input type="text" name="participant-last-{{ . }}" id="participant-last-input-{{ . }}" />
+
+  <label for="participant-company-input-{{ . }}">Firma</label>
+  <input type="text" name="participant-company-{{ . }}" id="participant-company-input-{{ . }}" />
+</div>
+{{ end }}