diff --git a/app/__init__.py b/app/__init__.py
index 18c3a92..fd530ca 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -187,6 +187,8 @@ def create_vehicle():
 
     if form.consumables.data:
         form.consumables.default = form.consumables.data
+    else:
+        form.consumables.default = []
 
     if form.validate_on_submit():
         if len(form.consumables.data) == 0:
@@ -319,7 +321,7 @@ def delete_pit_stop_form(pid):
 @app.route('/pitstops/edit/<int:pid>', methods=['GET', 'POST'])
 @login_required
 def edit_pit_stop_form(pid):
-    edit_pitstop = Pitstop.query.get(pid).first()
+    edit_pitstop = Pitstop.query.get(pid)
     if edit_pitstop is None:
         return redirect(url_for('get_pit_stops'))
 
@@ -339,14 +341,14 @@ def edit_pit_stop_form(pid):
     if form.validate_on_submit():
         edit_pitstop.costs = form.costs.data
         edit_pitstop.date = form.date.data
-        edit_pitstop.litres = form.litres.data
+        edit_pitstop.amount = form.litres.data
         edit_pitstop.odometer = form.odometer.data
         db.session.commit()
         tools.db_log_update(edit_pitstop)
         return redirect(url_for('get_pit_stops', _anchor='v' + str(vehicle.id)))
 
     form.odometer.default = edit_pitstop.odometer
-    form.litres.default = edit_pitstop.litres
+    form.litres.default = edit_pitstop.amount
     form.date.default = edit_pitstop.date
     form.costs.default = edit_pitstop.costs
     form.process()
@@ -354,7 +356,7 @@ def edit_pit_stop_form(pid):
         'date': 'Date must be between %s and %s (including).' % (str(last_pitstop.date), str(date.today())),
         'odometer': 'Odometer must be greater than %s km.' % (str(last_pitstop.odometer))
     }
-    if edit_pitstop.costs > 0:
+    if edit_pitstop.costs is not None and edit_pitstop.costs > 0:
         messages['costs'] = 'Costs must be higher than 0.01 €.'
     return render_template('editPitStopForm.html', form=form, vehicle=vehicle, messages=messages)
 
diff --git a/app/forms.py b/app/forms.py
index f884643..5a51f8c 100644
--- a/app/forms.py
+++ b/app/forms.py
@@ -82,7 +82,7 @@ class CreatePitstopForm(Form):
         if self.date.data:
             self.date.default = self.date.data
         else:
-            self.date.default = self.last_pitstop.date
+            self.date.default = date.today()
         if self.odometer.data:
             self.odometer.default = self.odometer.data
         else:
diff --git a/app/templates/deletePitstopForm.html b/app/templates/deletePitstopForm.html
index fa14203..871ec67 100644
--- a/app/templates/deletePitstopForm.html
+++ b/app/templates/deletePitstopForm.html
@@ -17,11 +17,18 @@
                 </tr>
                 <tr>
                     <th style='text-align:right'>Litres</th>
-                    <td style='text-align: left'>{{ pitstop.litres }} l</td>
+                    <td style='text-align: left'>{{ pitstop.amount }} {{ pitstop.consumable.unit }}</td>
                 </tr>
                 <tr>
                     <th style='text-align:right'>Costs (overall)</th>
-                    <td style='text-align: left'>{{ pitstop.costs }} €</td>
+                    <td style='text-align: left'>
+                        {% if pitstop.costs %}
+                            {{pitstop.costs}}
+                        {% else %}
+                            --
+                        {% endif %}
+                        €
+                    </td>
                 </tr>
             </table>
             <form class='form-horizontal' method='POST'>
diff --git a/app/templates/layout.html b/app/templates/layout.html
index 8920020..fc5929b 100644
--- a/app/templates/layout.html
+++ b/app/templates/layout.html
@@ -35,7 +35,13 @@
 			{% if field.type == 'SelectField' %}
 				<select id="{{ field.id }}" name="{{ field.id }}" class="form-control">
 					{% for choice in field.choices %}
-						<option value="{{ choice[0] }}">{{ choice[1] }}</option>
+						<option value="{{ choice[0] }}" {% if choice[0] == field.default %}selected="selected"{%endif%}>{{ choice[1] }}</option>
+					{% endfor %}
+				</select>
+			{% elif field.type == 'SelectMultipleField' %}
+				<select id="{{ field.id }}" name="{{ field.id }}" class="form-control" multiple="multiple">
+					{% for choice in field.choices %}
+						<option value="{{ choice[0] }}" {% if choice[0] in field.default %}selected="selected"{%endif%}>{{ choice[1] }}</option>
 					{% endfor %}
 				</select>
 			{% elif field.type == 'BooleanField' %}