diff --git a/templates/question.html b/templates/question.html
index e155c95..0ae6f89 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -1,14 +1,15 @@
-{{ 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>
+{{ define "answers" }}
+{{ range .Answers }}
+<label for="answer-{{ .ID }}">{{ .Text }}</label>
+<input type="radio" name="answer-{{ .ID }}" id="answer-{{ .ID }}" />
 {{ end }}
+{{ end }}
+
+{{ define "content" }}
+<h2>Frage {{ .Question.ID }}</h2>
+<p>{{ .Question.Text }}</p>
+
+{{ template "answers" . }}
+
+<button type="submit" hx-post="/submit-{{ .UUID }}-{{ .Question.ID }}/" hx-target="#content" hx-swap="innerHTML">
+  {{ end }}