diff --git a/gruppenbildungsspiel.py b/gruppenbildungsspiel.py
index 013994f..9d00308 100644
--- a/gruppenbildungsspiel.py
+++ b/gruppenbildungsspiel.py
@@ -29,9 +29,6 @@ class QuestionForm(Form):
     check = BooleanField('Bitte nicht ankreuzen')
     email = EmailField('Email-Adresse')
 
-class User():
-    name = ''
-
 @app.route('/')
 def index():
     return render_template('index.html', title='Test', text='Hallo, Fooboar') 
@@ -55,10 +52,10 @@ def questions():
             return redirect(url_for('result'))
     return render_template('questions.html', form=form)
 
-@app.route('/form')
-def form():
-    id = generate_id()
-    return render_template('form.html', title='Test', text='Hallo, Fooboar', your_id=id) 
+# @app.route('/form')
+# def form():
+   #  id = generate_id()
+    # return render_template('form.html', title='Test', text='Hallo, Fooboar', your_id=id) 
 
 @app.route('/result')
 def result():
diff --git a/templates/base.html b/templates/base.html
index c86f434..3a9cd4a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -14,7 +14,7 @@
         <nav>
              <ul>
                  <li {% if request.path == url_for('index') %} class="active" {% endif %}><a href="{{ url_for('index') }}">Home</a></li>
-                 <li {% if request.path == url_for('form') %} class="active" {% endif %}><a href="{{ url_for('form') }}">Formular</a></li>
+                 <li {% if request.path == url_for('questions') %} class="active" {% endif %}><a href="{{ url_for('questions') }}">Formular</a></li>
                  <li {% if request.path == url_for('answers') %} class="active" {% endif %}><a href="{{ url_for('answers') }}">Meine Antworten</a></li>
              </ul>
         </nav>
diff --git a/templates/index.html b/templates/index.html
index 5beacb7..880d239 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -6,7 +6,7 @@
             Kein Alkohol mehr.
         </div>
         <div class="btn-group">
-                <a href="{{ url_for('form') }}"><button>Jetzt mitspielen</button></a>
+                <a href="{{ url_for('questions') }}"><button>Jetzt mitspielen</button></a>
                 <a href="{{ url_for('answers') }}"><button>Hier geht's zu deinen Antworten</button></a>
 		<a href="{{ url_for('solution') }}"><button>Lösung einreichen</button></a>
 	</div>
diff --git a/templates/questions.html b/templates/questions.html
index 634a6f5..0a9721d 100644
--- a/templates/questions.html
+++ b/templates/questions.html
@@ -4,13 +4,21 @@
                 <form method=post>
                     <dl>
 			{{ render_field(form.computer) }}
+			<br>
 			{{ render_field(form.status) }}
+			<br>
 			{{ render_field(form.vegetable) }}
+			<br>
 			{{ render_field(form.spirit_animal) }}
+			<br>
 			{{ render_field(form.operating_system) }}
+			<br>
 			{{ form.check }} {{ form.check.label }}
+			<br>
+			<br>
                         {{ render_field(form.email) }}
 		    </dl>
+		    <p></p>
 		    <p><input type=submit value=Abschicken>
 		</form>
 		{% endblock %}