diff --git a/openslides/agenda/models.py b/openslides/agenda/models.py
index 7d6f706cf..119a2f7da 100644
--- a/openslides/agenda/models.py
+++ b/openslides/agenda/models.py
@@ -137,7 +137,7 @@ class Item(MPTTModel, SlideMixin):
         # TODO: Rename it to 'get_related_object'
         object = get_slide_from_sid(self.related_sid, element=True)
         if object is None:
-            self.title = _('Item for deleted slide %s') % self.related_sid
+            self.title = _('< Item for deleted slide (%s) >') % self.related_sid
             self.related_sid = None
             self.save()
             return self
diff --git a/openslides/agenda/templates/agenda/overlay_speaker_projector.html b/openslides/agenda/templates/agenda/overlay_speaker_projector.html
index 64657f208..cb86881ef 100644
--- a/openslides/agenda/templates/agenda/overlay_speaker_projector.html
+++ b/openslides/agenda/templates/agenda/overlay_speaker_projector.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 <style type="text/css">
     /* List of speakers – overlay */
diff --git a/openslides/agenda/templates/agenda/overlay_speaker_widget.html b/openslides/agenda/templates/agenda/overlay_speaker_widget.html
index f16ed747d..dce965148 100644
--- a/openslides/agenda/templates/agenda/overlay_speaker_widget.html
+++ b/openslides/agenda/templates/agenda/overlay_speaker_widget.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 <span>
     {% trans "List of speakers" %} <small class="grey">({% trans 'This overlay only appears on agenda slides if it is activated' %}.)</small>
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index 0ac81d5ef..6cda8851f 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load mptt_tags %}
 {% load staticfiles %}
@@ -42,7 +41,7 @@
             {% if perms.agenda.can_manage_agenda %}
             <a href="{% url 'item_new' %}" class="btn btn-mini btn-primary" rel="tooltip" data-original-title="{% trans 'New item' %}"><i class="icon-plus icon-white"></i> {% trans "New" %}</a>
             {% endif %}
-            <a href="{% url 'print_agenda' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}"><i class="icon-print"></i> PDF</a>
+            <a href="{% url 'print_agenda' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}" target="_blank"><i class="icon-print"></i> PDF</a>
             </small>
         </h1>
 
diff --git a/openslides/agenda/templates/agenda/speaker_widget.html b/openslides/agenda/templates/agenda/speaker_widget.html
index f01b901c4..0e5567ec7 100644
--- a/openslides/agenda/templates/agenda/speaker_widget.html
+++ b/openslides/agenda/templates/agenda/speaker_widget.html
@@ -1,13 +1,12 @@
 {% load i18n %}
-{% load tags %}
 
 {% if perms.agenda.can_be_speaker %}
-<p><a href="{% url 'agenda_add_to_current_list_of_speakers' %}" class="btn"><i class="icon icon-speaker"></i> {% trans 'Put me on the current list of speakers' %}</a></p>
+    <p><a href="{% url 'agenda_add_to_current_list_of_speakers' %}" class="btn"><i class="icon icon-speaker"></i> {% trans 'Put me on the current list of speakers' %}</a></p>
 {% endif %}
 
 <p><a href="{% url 'agenda_current_list_of_speakers' %}" class="btn"><i class="icon icon-bell"></i> {% trans 'Go to current list of speakers' %}</a></p>
 
 {% if perms.agenda.can_manage_agenda %}
-<hr>
-<a href="{% url 'agenda_next_on_current_list_of_speakers' %}" class="btn btn-mini"><i class="icon icon-bell"></i> {% trans 'Next speaker' %}</a>
+    <hr>
+    <a href="{% url 'agenda_next_on_current_list_of_speakers' %}" class="btn btn-mini"><i class="icon icon-bell"></i> {% trans 'Next speaker' %}</a>
 {% endif %}
diff --git a/openslides/agenda/templates/agenda/view.html b/openslides/agenda/templates/agenda/view.html
index 2fe33e92b..5db1cc341 100644
--- a/openslides/agenda/templates/agenda/view.html
+++ b/openslides/agenda/templates/agenda/view.html
@@ -20,27 +20,25 @@
 <h1>
     {{ item }}
     <small class="pull-right">
-    <div class="btn-toolbar">
-        <a href="{% url 'item_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
-        {% if perms.projector.can_manage_projector %}
-            <a href="{% url 'projector_activate_slide' item.sid  %}"
-                class="activate_link btn btn-mini {% if item.active and not show_list %}btn-primary{% endif %}"
-                rel="tooltip" data-original-title="{% trans 'Show' %}">
-                <i class="icon icon-facetime-video {% if item.active and not show_list %}icon-white{% endif %}"></i>
-            </a>
-        {% endif %}
-        {% if perms.agenda.can_manage_agenda %}
-        <div class="btn-group">
-            <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
-                {% trans 'More actions' %}
-                <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu pull-right">
-                <li><a href="{% model_url item 'update' %}"><i class="icon-pencil"></i> {% trans 'Edit item' %}</a></li>
-                <li><a href="{% model_url item 'delete' %}"><i class="icon-remove"></i> {% trans 'Delete item' %}</a></li>
-            </ul>
-        {% endif %}
-        </div>
+    <a href="{% url 'item_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+    {% if perms.projector.can_manage_projector %}
+        <a href="{% url 'projector_activate_slide' item.sid  %}"
+            class="activate_link btn btn-mini {% if item.active and not show_list %}btn-primary{% endif %}"
+            rel="tooltip" data-original-title="{% trans 'Show' %}">
+            <i class="icon icon-facetime-video {% if item.active and not show_list %}icon-white{% endif %}"></i>
+        </a>
+    {% endif %}
+    {% if perms.agenda.can_manage_agenda %}
+    <div class="btn-group">
+        <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
+            {% trans 'More actions' %}
+            <span class="caret"></span>
+        </a>
+        <ul class="dropdown-menu pull-right">
+            <li><a href="{% model_url item 'update' %}"><i class="icon-pencil"></i> {% trans 'Edit item' %}</a></li>
+            <li><a href="{% model_url item 'delete' %}"><i class="icon-remove"></i> {% trans 'Delete item' %}</a></li>
+        </ul>
+    {% endif %}
     </div>
     </small>
 </h1>
@@ -48,7 +46,7 @@
     {% if item.get_related_slide == item %}
         {{ item.text|safe|linebreaks }}
     {% else %}
-        <a href="{% model_url item.get_related_slide %}">{% trans 'Goto' %} {% trans item.get_related_type %} {{ item.get_related_slide }}</a>
+        <a href="{% model_url item.get_related_slide %}" class="btn btn-small">{% trans 'View' %} "{{ item.get_related_slide }}" ({% trans item.get_related_type %})</a>
     {% endif %}
 </p>
 
@@ -146,7 +144,7 @@
         {% endif %}
     </p>
 
-    {% if perms.can_manage_agenda %}
+    {% if perms.agenda.can_manage_agenda %}
         <form action="" method="post">{% csrf_token %}
             {% for field in form %}
                 <label>{{ field.label }}:</label>
diff --git a/openslides/agenda/templates/projector/agenda_list_of_speaker.html b/openslides/agenda/templates/projector/agenda_list_of_speaker.html
index 2af7fa492..726180c39 100644
--- a/openslides/agenda/templates/projector/agenda_list_of_speaker.html
+++ b/openslides/agenda/templates/projector/agenda_list_of_speaker.html
@@ -1,7 +1,6 @@
 {% extends 'base-projector.html' %}
 
 {% load i18n %}
-{% load tags %}
 
 {% block title %}{{ block.super }} – {{ item }}{% endblock %}
 
diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html
index 4e58d6a67..d1f138fd1 100644
--- a/openslides/assignment/templates/assignment/overview.html
+++ b/openslides/assignment/templates/assignment/overview.html
@@ -21,7 +21,7 @@
             <a href="{% url 'assignment_new' %}" class="btn btn-mini btn-primary" rel="tooltip" data-original-title="{% trans 'New election' %}"><i class="icon-plus icon-white"></i> {% trans "New" %}</a>
         {% endif %}
         {% if perms.assignment.can_see_assignment %}
-            <a href="{% url 'print_assignment' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all elections as PDF' %}"><i class="icon-print"></i> PDF</a>
+            <a href="{% url 'print_assignment' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all elections as PDF' %}" target="_blank"><i class="icon-print"></i> PDF</a>
         {% endif %}
         </small>
     </h1>
@@ -65,7 +65,7 @@
                         <i class="icon-remove"></i>
                     </a>
                 {% endif %}
-                <a href="{% url 'print_assignment' assignment.id  %}" class="btn btn-mini" title="{% trans 'Print election as PDF' %}">
+                <a href="{% url 'print_assignment' assignment.id  %}" class="btn btn-mini" title="{% trans 'Print election as PDF' %}" target="_blank">
                     <i class="icon-print"></i> PDF
                 </a>
                 </span>
diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index 3a43b6f32..d8f9ce873 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -70,7 +70,7 @@
     </table>
 
     <p>
-    <a href="{% url 'print_assignment_poll' poll.id %}" class="btn">
+    <a href="{% url 'print_assignment_poll' poll.id %}" class="btn" target="_blank">
         <i class="icon-print"></i> {% trans 'Ballot paper as PDF' %}
     </a>
     </p>
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index f08405f96..71bfc2473 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -19,7 +19,7 @@
     {{ assignment }}
     <small class="pull-right">
     <a href="{% url 'assignment_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
-    <a href="{% url 'print_assignment' assignment.id  %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print election as PDF' %}"><i class="icon-print"></i> PDF</a>
+    <a href="{% url 'print_assignment' assignment.id  %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print election as PDF' %}" target="_blank"><i class="icon-print"></i> PDF</a>
     <!-- activate projector -->
     {% if perms.projector.can_manage_projector %}
         <a href="{% url 'projector_activate_slide' assignment.sid  %}" class="activate_link btn {% if assignment.active %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show election' %}">
diff --git a/openslides/assignment/templates/projector/Assignment.html b/openslides/assignment/templates/projector/Assignment.html
index 761e70bf1..0819069d9 100644
--- a/openslides/assignment/templates/projector/Assignment.html
+++ b/openslides/assignment/templates/projector/Assignment.html
@@ -1,6 +1,5 @@
 {% extends "base-projector.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load staticfiles %}
 
diff --git a/openslides/core/templates/core/version.html b/openslides/core/templates/core/version.html
index b83508bcc..90d251749 100644
--- a/openslides/core/templates/core/version.html
+++ b/openslides/core/templates/core/version.html
@@ -8,7 +8,7 @@
     <h1>{% trans 'Version' %}</h1>
     <ul>
     {% for version in versions %}
-        <li>{{ version.0 }} – {% trans "Version" %} {{ version.1 }}</li>
+        <li>{{ version.0 }} – {% trans 'Version' %} {{ version.1 }}</li>
     {% endfor %}
     </ul>
 {% endblock %}
diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo
index 291346e8f..c7f9aec84 100644
Binary files a/openslides/locale/de/LC_MESSAGES/django.mo and b/openslides/locale/de/LC_MESSAGES/django.mo differ
diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po
index 78b998057..665cbc08d 100644
--- a/openslides/locale/de/LC_MESSAGES/django.po
+++ b/openslides/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenSlides 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-16 22:49+0200\n"
+"POT-Creation-Date: 2013-05-28 22:07+0200\n"
 "PO-Revision-Date: 2012-07-28 11:07+0200\n"
 "Last-Translator: Emanuel Schuetze <emanuel@intevation.de>\n"
 "Language-Team: support@openslides.de\n"
@@ -87,18 +87,18 @@ msgstr "Organisatorischer Eintrag"
 
 #: agenda/models.py:44 core/signals.py:76 mediafile/models.py:32
 #: mediafile/templates/mediafile/mediafile_list.html:18 motion/forms.py:34
-#: motion/models.py:552 participant/models.py:39 participant/views.py:193
+#: motion/models.py:562 participant/models.py:39 participant/views.py:204
 #: participant/templates/participant/overview.html:48 projector/models.py:27
 msgid "Title"
 msgstr "Titel"
 
-#: agenda/models.py:49 motion/forms.py:39 motion/models.py:555
+#: agenda/models.py:49 motion/forms.py:39 motion/models.py:565
 #: projector/models.py:28
 msgid "Text"
 msgstr "Text"
 
 #: agenda/models.py:54 agenda/templates/agenda/overview.html:75
-#: agenda/templates/agenda/view.html:51 participant/models.py:51
+#: agenda/templates/agenda/view.html:55 participant/models.py:51
 #: participant/templates/participant/overview.html:55
 #: participant/templates/participant/user_detail.html:67
 msgid "Comment"
@@ -132,12 +132,16 @@ msgstr "Darf die Tagesordung verwalten"
 msgid "Can see orga items and time scheduling of agenda"
 msgstr "Darf Organisationspunkte und Tagesordnung-Zeitplan sehen"
 
-#: agenda/models.py:319
+#: agenda/models.py:140
+msgid "Item for deleted slide %s"
+msgstr "Eintrag für gelöschte Folie %s"
+
+#: agenda/models.py:327
 #, python-format
 msgid "%(person)s is already on the list of speakers of item %(id)s."
 msgstr "%(person)s ist bereits auf der Rednerliste von Eintrag %(id)s."
 
-#: agenda/models.py:359
+#: agenda/models.py:367
 msgid "Can put oneself on the list of speakers"
 msgstr "Darf sich selbst auf die Rednerliste setzen"
 
@@ -154,8 +158,8 @@ msgid "Number of last speakers to be shown on the projector"
 msgstr "Anzahl der dargestellten letzten Redner auf dem Projektor"
 
 #: agenda/signals.py:59 agenda/slides.py:23 agenda/slides.py:29
-#: agenda/views.py:241 agenda/views.py:242 agenda/views.py:499
-#: agenda/views.py:514 agenda/templates/agenda/overview.html:8
+#: agenda/views.py:241 agenda/views.py:242 agenda/views.py:521
+#: agenda/views.py:536 agenda/templates/agenda/overview.html:8
 #: agenda/templates/agenda/overview.html:40
 #: agenda/templates/agenda/overview.html:87
 #: agenda/templates/projector/AgendaSummary.html:6
@@ -185,7 +189,7 @@ msgstr "Eintrag %s und seine Kindelemente wurde erfolgreich gelöscht."
 msgid "Item %s was successfully deleted."
 msgstr "Eintrag %s wurde erfolgreich gelöscht."
 
-#: agenda/views.py:267 agenda/views.py:476
+#: agenda/views.py:267 agenda/views.py:483
 msgid "The list of speakers is closed."
 msgstr "Die Rednerliste ist geschlossen."
 
@@ -211,7 +215,7 @@ msgstr "Es spricht derzeit kein Redner zu %(item)s."
 msgid "Could not change order. Invalid data."
 msgstr "Die Reihenfolge kann nicht verändert werden. Ungültige Daten."
 
-#: agenda/views.py:470
+#: agenda/views.py:477
 msgid ""
 "There is no list of speakers for the current slide. Please choose the agenda "
 "item manually from the agenda."
@@ -219,24 +223,35 @@ msgstr ""
 "Es existiert keine Rednerliste für die aktuelle Folie. Bitte wählen Sie den "
 "Tagesordnungseintrag manuell von der Tagesordnung."
 
-#: agenda/views.py:483
+#: agenda/views.py:490
 msgid "You are already on the list of speakers."
 msgstr "Sie stehen bereits auf der Rednerliste."
 
-#: agenda/views.py:485
+#: agenda/views.py:494
 msgid "You can not put yourself on the list of speakers."
 msgstr "Sie können sich nicht selbst auf die Rednerliste setzen."
 
-#: agenda/views.py:525
-#: agenda/templates/agenda/overlay_speaker_projector.html:5
+#: agenda/views.py:503
+#, python-format
+msgid "%s is now speaking."
+msgstr ""
+
+#: agenda/views.py:505
+#: agenda/templates/agenda/overlay_speaker_projector.html:46
+#: agenda/templates/projector/agenda_list_of_speaker.html:47
+msgid "The list of speakers is empty."
+msgstr "Die Rednerliste ist leer."
+
+#: agenda/views.py:547
+#: agenda/templates/agenda/overlay_speaker_projector.html:33
 #: agenda/templates/agenda/overlay_speaker_widget.html:5
-#: agenda/templates/agenda/view.html:57
-#: agenda/templates/projector/agenda_list_of_speaker.html:11
+#: agenda/templates/agenda/view.html:61
+#: agenda/templates/projector/agenda_list_of_speaker.html:28
 msgid "List of speakers"
 msgstr "Rednerliste"
 
 #: agenda/templates/agenda/edit.html:8 agenda/templates/agenda/edit.html:17
-#: agenda/templates/agenda/view.html:32
+#: agenda/templates/agenda/view.html:38
 msgid "Edit item"
 msgstr "Eintrag bearbeiten"
 
@@ -245,13 +260,13 @@ msgstr "Eintrag bearbeiten"
 msgid "New item"
 msgstr "Neuer Eintrag"
 
-#: agenda/templates/agenda/edit.html:22 agenda/templates/agenda/view.html:24
+#: agenda/templates/agenda/edit.html:22 agenda/templates/agenda/view.html:23
 #: assignment/templates/assignment/edit.html:22
 #: assignment/templates/assignment/view.html:21
 #: mediafile/templates/mediafile/mediafile_form.html:22
 #: motion/templates/motion/category_list.html:15
 #: motion/templates/motion/motion_detail.html:23
-#: motion/templates/motion/motion_form.html:37
+#: motion/templates/motion/motion_form.html:38
 #: motion/templates/motion/motion_form_csv_import.html:11
 #: participant/templates/participant/edit.html:22
 #: participant/templates/participant/group_detail.html:12
@@ -269,8 +284,8 @@ msgstr "Zurück zur Übersicht"
 #: config/templates/config/config_form.html:44
 #: mediafile/templates/mediafile/mediafile_form.html:33
 #: motion/templates/motion/category_form.html:28
-#: motion/templates/motion/motion_form.html:46
-#: motion/templates/motion/motion_form_csv_import.html:41
+#: motion/templates/motion/motion_form.html:47
+#: motion/templates/motion/motion_form_csv_import.html:42
 #: motion/templates/motion/poll_form.html:73
 #: participant/templates/participant/edit.html:36
 #: participant/templates/participant/group_edit.html:31
@@ -283,8 +298,8 @@ msgstr "Abbrechen"
 #: config/templates/config/config_form.html:46
 #: mediafile/templates/mediafile/mediafile_form.html:35
 #: motion/templates/motion/category_form.html:31
-#: motion/templates/motion/motion_form.html:49
-#: motion/templates/motion/motion_form_csv_import.html:44
+#: motion/templates/motion/motion_form.html:50
+#: motion/templates/motion/motion_form_csv_import.html:45
 #: participant/templates/participant/edit.html:39
 #: participant/templates/participant/group_edit.html:34
 #: participant/templates/participant/import.html:41
@@ -297,7 +312,7 @@ msgid "Show agenda item"
 msgstr "Tagesordnungseintrag projizieren"
 
 #: agenda/templates/agenda/item_row.html:16
-#: agenda/templates/agenda/view.html:69 agenda/templates/agenda/widget.html:34
+#: agenda/templates/agenda/view.html:73 agenda/templates/agenda/widget.html:34
 msgid "Show list of speakers"
 msgstr "Rednerliste projizieren"
 
@@ -319,7 +334,7 @@ msgid "Edit"
 msgstr "Bearbeiten"
 
 #: agenda/templates/agenda/item_row.html:24
-#: agenda/templates/agenda/view.html:125
+#: agenda/templates/agenda/view.html:129
 #: assignment/templates/assignment/overview.html:64
 #: assignment/templates/assignment/view.html:168
 #: mediafile/templates/mediafile/mediafile_list.html:38
@@ -345,40 +360,39 @@ msgstr "Ende"
 msgid "Change status (open/closed)"
 msgstr "Status ändern (offen/abgeschlossen)"
 
-#: agenda/templates/agenda/overlay_speaker_projector.html:5
-#: agenda/templates/agenda/view.html:57
-#: agenda/templates/projector/agenda_list_of_speaker.html:12
+#: agenda/templates/agenda/overlay_speaker_projector.html:33
+#: agenda/templates/agenda/view.html:61
+#: agenda/templates/projector/agenda_list_of_speaker.html:29
 msgid "closed"
 msgstr "geschlossen"
 
-#: agenda/templates/agenda/overlay_speaker_projector.html:18
-#: agenda/templates/projector/agenda_list_of_speaker.html:30
-msgid "The list of speakers is empty."
-msgstr "Die Rednerliste ist leer."
+#: agenda/templates/agenda/overlay_speaker_widget.html:5
+msgid "This overlay only appears on agenda slides if it is activated"
+msgstr ""
 
 #: agenda/templates/agenda/overview.html:32
 msgid "Do you want to save the changed order of agenda items?"
 msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?"
 
 #: agenda/templates/agenda/overview.html:34
-#: agenda/templates/agenda/view.html:82 assignment/models.py:288
+#: agenda/templates/agenda/view.html:86 assignment/models.py:288
 #: assignment/views.py:580 assignment/templates/assignment/view.html:201
 #: assignment/templates/assignment/view.html:205
 #: assignment/templates/projector/Assignment.html:78
-#: assignment/templates/projector/Assignment.html:82 motion/models.py:715
-#: motion/pdf.py:147 motion/pdf.py:269
-#: motion/templates/motion/motion_detail.html:207
+#: assignment/templates/projector/Assignment.html:82 motion/models.py:723
+#: motion/pdf.py:134 motion/pdf.py:256
+#: motion/templates/motion/motion_detail.html:204
 #: motion/templates/projector/Motion.html:27 utils/utils.py:46
 #: utils/views.py:169
 msgid "Yes"
 msgstr "Ja"
 
 #: agenda/templates/agenda/overview.html:35
-#: agenda/templates/agenda/view.html:83 assignment/models.py:288
+#: agenda/templates/agenda/view.html:87 assignment/models.py:288
 #: assignment/views.py:581 assignment/templates/assignment/view.html:202
-#: assignment/templates/projector/Assignment.html:79 motion/models.py:715
-#: motion/pdf.py:147 motion/pdf.py:270
-#: motion/templates/motion/motion_detail.html:208
+#: assignment/templates/projector/Assignment.html:79 motion/models.py:723
+#: motion/pdf.py:134 motion/pdf.py:257
+#: motion/templates/motion/motion_detail.html:205
 #: motion/templates/projector/Motion.html:28 utils/utils.py:46
 #: utils/views.py:169
 msgid "No"
@@ -450,27 +464,15 @@ msgstr "Keine Einträge vorhanden."
 msgid "Put me on the current list of speakers"
 msgstr "Auf die aktuelle Rednerliste setzen"
 
-#: agenda/templates/agenda/speaker_widget.html:6
+#: agenda/templates/agenda/speaker_widget.html:8
 msgid "Go to current list of speakers"
 msgstr "Zur aktuellen Rednerliste"
 
-#: agenda/templates/agenda/speaker_widget.html:10
+#: agenda/templates/agenda/speaker_widget.html:12
 msgid "Next speaker"
 msgstr "Nächster Redner"
 
-#: agenda/templates/agenda/view.html:28
-#: assignment/templates/assignment/view.html:32
-#: motion/templates/motion/motion_detail.html:34
-#: participant/templates/participant/group_detail.html:22
-#: participant/templates/participant/user_detail.html:23
-msgid "More actions"
-msgstr "Mehr Aktionen"
-
-#: agenda/templates/agenda/view.html:33
-msgid "Delete item"
-msgstr "Eintrag löschen"
-
-#: agenda/templates/agenda/view.html:40 agenda/templates/agenda/widget.html:8
+#: agenda/templates/agenda/view.html:27 agenda/templates/agenda/widget.html:8
 #: agenda/templates/agenda/widget.html:23
 #: assignment/templates/assignment/overview.html:56
 #: assignment/templates/assignment/widget.html:7
@@ -486,55 +488,71 @@ msgstr "Eintrag löschen"
 msgid "Show"
 msgstr "Anzeigen"
 
-#: agenda/templates/agenda/view.html:61
+#: agenda/templates/agenda/view.html:34
+#: assignment/templates/assignment/view.html:32
+#: motion/templates/motion/motion_detail.html:34
+#: participant/templates/participant/group_detail.html:22
+#: participant/templates/participant/user_detail.html:23
+msgid "More actions"
+msgstr "Mehr Aktionen"
+
+#: agenda/templates/agenda/view.html:39
+msgid "Delete item"
+msgstr "Eintrag löschen"
+
+#: agenda/templates/agenda/view.html:49
+msgid "View"
+msgstr ""
+
+#: agenda/templates/agenda/view.html:65
 msgid "Open list"
 msgstr "Liste öffnen"
 
-#: agenda/templates/agenda/view.html:63
+#: agenda/templates/agenda/view.html:67
 msgid "Close list"
 msgstr "Liste schließen"
 
-#: agenda/templates/agenda/view.html:71
+#: agenda/templates/agenda/view.html:75
 msgid "Show list"
 msgstr "Liste projizieren"
 
-#: agenda/templates/agenda/view.html:79
+#: agenda/templates/agenda/view.html:83
 msgid "Do you want to save the changed order of speakers?"
 msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?"
 
-#: agenda/templates/agenda/view.html:92
+#: agenda/templates/agenda/view.html:96
 msgid "Last speakers"
 msgstr "Letzte Redner"
 
-#: agenda/templates/agenda/view.html:95
+#: agenda/templates/agenda/view.html:99
 msgid "Show all speakers"
 msgstr "Alle Redner anzeigen"
 
-#: agenda/templates/agenda/view.html:99
+#: agenda/templates/agenda/view.html:103
 msgid "Current speaker"
 msgstr "Aktueller Redner"
 
-#: agenda/templates/agenda/view.html:101
+#: agenda/templates/agenda/view.html:105
 msgid "Next speakers"
 msgstr "Nächster Redner"
 
-#: agenda/templates/agenda/view.html:121
+#: agenda/templates/agenda/view.html:125
 msgid "End speach"
 msgstr "Rede beenden"
 
-#: agenda/templates/agenda/view.html:123
+#: agenda/templates/agenda/view.html:127
 msgid "Begin speach"
 msgstr "Rede beginnen"
 
-#: agenda/templates/agenda/view.html:137
+#: agenda/templates/agenda/view.html:141
 msgid "Remove me from the list"
 msgstr "Entferne mich von der Liste"
 
-#: agenda/templates/agenda/view.html:139
+#: agenda/templates/agenda/view.html:143
 msgid "Put me on the list"
 msgstr "Setze mich auf die Liste"
 
-#: agenda/templates/agenda/view.html:149
+#: agenda/templates/agenda/view.html:153
 #: assignment/templates/assignment/poll_view.html:83
 #: assignment/templates/assignment/view.html:109
 #: motion/templates/motion/poll_form.html:70
@@ -543,7 +561,7 @@ msgstr "Setze mich auf die Liste"
 msgid "Apply"
 msgstr "Übernehmen"
 
-#: agenda/templates/agenda/view.html:151
+#: agenda/templates/agenda/view.html:155
 #: assignment/templates/assignment/view.html:111
 msgid "Add new participant"
 msgstr "Neue/n Teilnehmer/in hinzufügen"
@@ -569,6 +587,10 @@ msgstr "Anzahl der zur Wahl stehenden Posten"
 msgid "Nominate a participant"
 msgstr "Teilnehmer/in vorschlagen"
 
+#: assignment/models.py:40
+msgid "assignment"
+msgstr "Wahl"
+
 #: assignment/models.py:42 assignment/templates/assignment/view.html:279
 msgid "Searching for candidates"
 msgstr "Auf Kandidatensuche"
@@ -639,7 +661,7 @@ msgstr "Darf selbst für Wahlen kandidieren"
 msgid "Can manage assignment"
 msgstr "Darf Wahlen verwalten"
 
-#: assignment/models.py:288 motion/models.py:715
+#: assignment/models.py:288 motion/models.py:723
 msgid "Abstain"
 msgstr "Enthaltung"
 
@@ -647,7 +669,7 @@ msgstr "Enthaltung"
 msgid "Votes"
 msgstr "Stimmen"
 
-#: assignment/models.py:307 motion/models.py:729
+#: assignment/models.py:307
 #, python-format
 msgid "Ballot %d"
 msgstr "Wahlgang %d"
@@ -721,7 +743,7 @@ msgstr "Neue Wahl wurde erfolgreich angelegt."
 msgid "Election was successfully modified."
 msgstr "Wahl wurde erfolgreich geändert."
 
-#: assignment/views.py:117 participant/views.py:454 participant/views.py:478
+#: assignment/views.py:117 participant/views.py:465 participant/views.py:489
 #: utils/views.py:318 utils/views.py:340 utils/views.py:350
 msgid "Please check the form for errors."
 msgstr "Bitte kontrollieren Sie das Formular nach Fehlern."
@@ -822,8 +844,8 @@ msgstr "Wahlen: %s"
 msgid "Candidates"
 msgstr "Kandidaten/innen"
 
-#: assignment/views.py:402 motion/pdf.py:133
-#: motion/templates/motion/motion_detail.html:194
+#: assignment/views.py:402 motion/pdf.py:120
+#: motion/templates/motion/motion_detail.html:191
 msgid "Vote results"
 msgstr "Abstimmungsergebnis"
 
@@ -861,8 +883,8 @@ msgstr "Ungültige Stimmen"
 #: assignment/templates/assignment/view.html:235
 #: assignment/templates/assignment/view.html:240
 #: assignment/templates/projector/Assignment.html:109
-#: assignment/templates/projector/Assignment.html:115 motion/pdf.py:148
-#: motion/templates/motion/motion_detail.html:212
+#: assignment/templates/projector/Assignment.html:115 motion/pdf.py:135
+#: motion/templates/motion/motion_detail.html:209
 #: motion/templates/motion/poll_form.html:51
 #: motion/templates/projector/Motion.html:32 poll/models.py:76
 msgid "Votes cast"
@@ -896,8 +918,8 @@ msgstr[0] "%d verfügbare Posten"
 msgstr[1] "%d verfügbare Posten"
 
 #: assignment/views.py:581 assignment/templates/assignment/view.html:203
-#: assignment/templates/projector/Assignment.html:80 motion/pdf.py:147
-#: motion/pdf.py:271 motion/templates/motion/motion_detail.html:209
+#: assignment/templates/projector/Assignment.html:80 motion/pdf.py:134
+#: motion/pdf.py:258 motion/templates/motion/motion_detail.html:206
 #: motion/templates/projector/Motion.html:29
 msgid "Abstention"
 msgstr "Enthaltung"
@@ -1046,8 +1068,8 @@ msgid "was not a <br> candidate"
 msgstr "war kein Kandidat"
 
 #: assignment/templates/assignment/view.html:224
-#: assignment/templates/projector/Assignment.html:100 motion/pdf.py:147
-#: motion/templates/motion/motion_detail.html:210
+#: assignment/templates/projector/Assignment.html:100 motion/pdf.py:134
+#: motion/templates/motion/motion_detail.html:207
 #: motion/templates/projector/Motion.html:30
 msgid "Invalid"
 msgstr "Ungültig"
@@ -1130,7 +1152,7 @@ msgid "General"
 msgstr "Allgemein"
 
 #: core/templates/core/version.html:5 core/templates/core/version.html.py:8
-#: core/templates/core/version.html:11 motion/pdf.py:117
+#: core/templates/core/version.html:11 motion/pdf.py:104
 #: motion/templates/motion/motion_detail.html:20
 #: motion/templates/motion/motion_diff.html:36
 #: motion/templates/motion/motion_diff.html:40
@@ -1230,7 +1252,7 @@ msgstr ""
 msgid "Motion imported"
 msgstr "Antrag importiert"
 
-#: motion/forms.py:45 motion/models.py:558 motion/pdf.py:170
+#: motion/forms.py:45 motion/models.py:568 motion/pdf.py:157
 #: motion/templates/motion/motion_detail.html:81
 #: motion/templates/motion/motion_diff.html:55
 #: motion/templates/projector/Motion.html:73
@@ -1244,7 +1266,7 @@ msgstr "Begründung"
 msgid "Submitter"
 msgstr "Antragsteller/in"
 
-#: motion/forms.py:84 motion/pdf.py:79
+#: motion/forms.py:84 motion/pdf.py:80
 #: motion/templates/motion/motion_detail.html:173
 #: motion/templates/motion/motion_list.html:44
 msgid "Supporters"
@@ -1258,7 +1280,7 @@ msgstr "Keine neue Version erzeugen"
 msgid "Don't create a new version. Useful e.g. for trivial changes."
 msgstr "Keine neue Version erzeugen. Nützlich z.B. für triviale Änderungen."
 
-#: motion/forms.py:113 motion/templates/motion/motion_detail.html:234
+#: motion/forms.py:113 motion/templates/motion/motion_detail.html:231
 #: motion/templates/motion/motion_list.html:40
 msgid "Category"
 msgstr "Sachgebiet"
@@ -1279,13 +1301,13 @@ msgstr ""
 "Setzt den Antrag auf einen bestimmten Arbeitsablauf. In diesem Fall wird der "
 "Status des Antrags zurückgesetzt."
 
-#: motion/forms.py:159 participant/forms.py:122
+#: motion/forms.py:159 participant/forms.py:132
 msgid "CSV File"
 msgstr "CSV-Datei"
 
 #: motion/forms.py:160
-msgid "The file should be encoded in UTF-8."
-msgstr "Die Datei sollte UTF-8-kodiert sein."
+msgid "The file has to be encoded in UTF-8."
+msgstr "Die Datei muss UTF-8-kodiert sein."
 
 #: motion/forms.py:167
 msgid "Override existing motions with the same identifier"
@@ -1311,6 +1333,10 @@ msgstr ""
 "Diese Person wird für jede Zeile aus Ihrer CSV-Datei als Antragsteller "
 "verwendet, bei der kein gültiger Antragsteller enthalten ist."
 
+#: motion/models.py:46
+msgid "motion"
+msgstr "Antrag"
+
 #: motion/models.py:91
 msgid "Can see motions"
 msgstr "Darf Anträge sehen"
@@ -1327,48 +1353,72 @@ msgstr "Darf Anträge unterstützen"
 msgid "Can manage motions"
 msgstr "Darf Anträge verwalten"
 
-#: motion/models.py:575
+#: motion/models.py:468 motion/models.py:469 motion/signals.py:111
+#: motion/views.py:233 motion/views.py:546
+#: motion/templates/motion/motion_detail.html:7
+#: motion/templates/motion/motion_detail.html:15
+#: motion/templates/motion/motion_diff.html:7
+#: motion/templates/motion/motion_diff.html:20
+#: motion/templates/motion/poll_form.html:6
+#: motion/templates/motion/poll_form.html:14
+#: motion/templates/projector/Motion.html:7
+#: motion/templates/projector/Motion.html:56
+#: motion/templates/projector/Motion.html:58
+msgid "Motion"
+msgstr "Antrag"
+
+#: motion/models.py:585
 msgid "new"
 msgstr "Neu"
 
-#: motion/models.py:622 motion/templates/motion/category_list.html:22
+#: motion/models.py:632 motion/templates/motion/category_list.html:22
 msgid "Category name"
 msgstr "Sachgebiet"
 
-#: motion/models.py:625 motion/templates/motion/category_list.html:21
+#: motion/models.py:635 motion/templates/motion/category_list.html:21
 msgid "Prefix"
 msgstr "Präfix"
 
-#: motion/pdf.py:48 motion/views.py:633
+#: motion/models.py:687
+#, python-format
+msgid " by %s"
+msgstr ""
+
+#: motion/models.py:737
+#, python-format
+msgid "Vote %d"
+msgstr "Abstimmung %d"
+
+#: motion/pdf.py:48 motion/views.py:644
 #, python-format
 msgid "Motion: %s"
 msgstr "Antrag: %s"
 
-#: motion/pdf.py:68
+#: motion/pdf.py:69
 msgid "Signature"
 msgstr "Unterschrift"
 
-#: motion/pdf.py:108
+#: motion/pdf.py:95
 msgid "State"
 msgstr "Status"
 
-#: motion/pdf.py:143 motion/templates/motion/motion_detail.html:199
+#: motion/pdf.py:130 motion/templates/motion/motion_detail.html:196
 #: motion/templates/motion/poll_form.html:6
 #: motion/templates/motion/poll_form.html:14
 #: motion/templates/projector/Motion.html:23
 msgid "Vote"
 msgstr "Abstimmung"
 
-#: motion/pdf.py:254 motion/templates/motion/widget.html:26
+#: motion/pdf.py:241 motion/templates/motion/widget.html:26
 msgid "No motions available."
 msgstr "Keine Anträge vorhanden."
 
-#: motion/pdf.py:265
+#: motion/pdf.py:252
 #, python-format
 msgid "Motion No. %s"
 msgstr "Antrag Nr. %s"
 
-#: motion/pdf.py:267
+#: motion/pdf.py:254
 #, python-format
 msgid "%d. Vote"
 msgstr "%d. Abstimmung"
@@ -1394,8 +1444,8 @@ msgstr "Die Versammlung möge beschließen,"
 msgid "Motion preamble"
 msgstr "Antragseinleitung"
 
-#: motion/signals.py:73 motion/views.py:631 motion/views.py:721
-#: motion/views.py:735 motion/templates/motion/category_list.html:6
+#: motion/signals.py:73 motion/views.py:642 motion/views.py:732
+#: motion/views.py:746 motion/templates/motion/category_list.html:6
 #: motion/templates/motion/motion_list.html:7
 #: motion/templates/motion/motion_list.html:20
 msgid "Motions"
@@ -1429,18 +1479,6 @@ msgstr "pro Sachgebiet nummerieren"
 msgid "Set it manually"
 msgstr "manuell setzen"
 
-#: motion/signals.py:111 motion/views.py:535
-#: motion/templates/motion/motion_detail.html:7
-#: motion/templates/motion/motion_detail.html:15
-#: motion/templates/motion/motion_diff.html:7
-#: motion/templates/motion/motion_diff.html:20
-#: motion/templates/motion/poll_form.html:6
-#: motion/templates/motion/poll_form.html:14
-#: motion/templates/projector/Motion.html:7
-#: motion/templates/projector/Motion.html:58
-msgid "Motion"
-msgstr "Antrag"
-
 #: motion/signals.py:132
 msgid "Simple Workflow"
 msgstr "Einfacher Arbeitsablauf"
@@ -1541,110 +1579,115 @@ msgstr "Verworfen (nicht zulässig)"
 msgid "Reject (not authorized)"
 msgstr "Verwerfen (nicht zulässig)"
 
-#: motion/views.py:193
+#: motion/views.py:195
 msgid "Motion created"
 msgstr "Antrag erstellt"
 
-#: motion/views.py:215
+#: motion/views.py:217
 msgid "Motion updated"
 msgstr "Antrag aktualisiert"
 
-#: motion/views.py:241
+#: motion/views.py:233 utils/views.py:379
+#, python-format
+msgid "%s was successfully deleted."
+msgstr "%s wurde erfolgreich gelöscht."
+
+#: motion/views.py:246
 msgid "Version successfully permitted."
 msgstr "Version erfolgreich zugelassen."
 
-#: motion/views.py:260
+#: motion/views.py:265
 #, python-format
 msgid "Are you sure you want permit Version %s?"
 msgstr "Soll Version <b>%s</b> wirklich zugelassen werden?"
 
-#: motion/views.py:269
+#: motion/views.py:274
 #, python-format
 msgid "Version %d permitted"
 msgstr "Version %d zugelassen"
 
-#: motion/views.py:298
+#: motion/views.py:303
 #, python-format
 msgid "Are you sure you want reject Version %s?"
 msgstr "Soll Version <b>%s</b> wirklich zurückgewiesen werden?"
 
-#: motion/views.py:307
+#: motion/views.py:312
 #, python-format
 msgid "Version %d rejected"
 msgstr "Version %d verworfen"
 
-#: motion/views.py:329
+#: motion/views.py:340
 msgid "At least one version number is not valid."
 msgstr "Mindestens eine Versionsnummer ist ungültig"
 
-#: motion/views.py:367
+#: motion/views.py:378
 msgid "You can not support this motion."
 msgstr "Sie dürfen diesen Antrag nicht unterstützen."
 
-#: motion/views.py:370
+#: motion/views.py:381
 msgid "You can not unsupport this motion."
 msgstr "Sie dürfen Ihre Unterstützung für diesen Antrag nicht entziehen."
 
-#: motion/views.py:378
+#: motion/views.py:389
 msgid "Do you really want to support this motion?"
 msgstr "Wollen Sie wirklich diesen Antrag unterstützen?"
 
-#: motion/views.py:380
+#: motion/views.py:391
 msgid "Do you really want to unsupport this motion?"
 msgstr "Wollen Sie wirklich Ihre Unterstützung für diesen Antrag entziehen?"
 
-#: motion/views.py:392
+#: motion/views.py:403
 #, python-format
 msgid "Supporter: +%s"
 msgstr "Unterstützer/in: +%s"
 
-#: motion/views.py:395
+#: motion/views.py:406
 #, python-format
 msgid "Supporter: -%s"
 msgstr "Unterstützer/in: -%s"
 
-#: motion/views.py:400
+#: motion/views.py:411
 msgid "You have supported this motion successfully."
 msgstr "Sie haben den Antrag erfolgreich unterstützt."
 
-#: motion/views.py:402
+#: motion/views.py:413
 msgid "You have unsupported this motion successfully."
 msgstr "Sie haben dem Antrag erfolgreich Ihre Unterstützung entzogen."
 
-#: motion/views.py:425
+#: motion/views.py:436
 msgid "Poll created"
 msgstr "Abstimmung erstellt"
 
-#: motion/views.py:426
+#: motion/views.py:437
 msgid "New vote was successfully created."
 msgstr "Neue Abstimmung erfolgreich angelegt."
 
-#: motion/views.py:490
+#: motion/views.py:501
 msgid "Poll updated"
 msgstr "Abstimmung wurde aktualisiert"
 
-#: motion/views.py:508
+#: motion/views.py:519
 msgid "Poll deleted"
 msgstr "Abstimmung gelöscht"
 
-#: motion/views.py:535
+#: motion/views.py:546
 msgid "Poll"
 msgstr "Abstimmung"
 
-#: motion/views.py:581
+#: motion/views.py:592
 msgid "State changed to "
 msgstr "Status geändert zu "
 
-#: motion/views.py:583
+#: motion/views.py:595
 #, python-format
 msgid "The state of the motion was set to %s."
 msgstr "Der Status des Antrags wurde auf %s gesetzt."
 
-#: motion/views.py:605
+#: motion/views.py:616
 msgid "Agenda item created"
 msgstr "Tagesordnungseintrag angelegt"
 
-#: motion/views.py:711
+#: motion/views.py:722
 #, python-format
 msgid "%d motions were successfully imported."
 msgstr "%d Anträge wurden erfolgreich importiert."
@@ -1685,8 +1728,8 @@ msgid "Show motion"
 msgstr "Antrag anzeigen"
 
 #: motion/templates/motion/motion_detail.html:40
-#: motion/templates/motion/motion_form.html:20
-#: motion/templates/motion/motion_form.html:29
+#: motion/templates/motion/motion_form.html:21
+#: motion/templates/motion/motion_form.html:30
 msgid "Edit motion"
 msgstr "Antrag bearbeiten"
 
@@ -1695,15 +1738,18 @@ msgid "Delete motion"
 msgstr "Antrag löschen"
 
 #: motion/templates/motion/motion_detail.html:62
-msgid "This is not the newest version."
+#, fuzzy
+msgid "This is not the last not rejected version."
 msgstr "Dies ist nicht die neuste Version."
 
 #: motion/templates/motion/motion_detail.html:64
-msgid "Go to last version"
-msgstr "Zu letzten Version"
+#, fuzzy
+msgid "Go to last not rejected version"
+msgstr "Zur letzten zugelassenen Version"
 
 #: motion/templates/motion/motion_detail.html:69
-msgid "This version is not yet authorized."
+#, fuzzy
+msgid "This version is not authorized."
 msgstr "Diese Version wurde noch nicht zugelassen."
 
 #: motion/templates/motion/motion_detail.html:71
@@ -1746,58 +1792,58 @@ msgstr "Diese Version wurde verworfen"
 msgid "Show log"
 msgstr "Log anzeigen"
 
-#: motion/templates/motion/motion_detail.html:201
+#: motion/templates/motion/motion_detail.html:198
 msgid "Edit Vote"
 msgstr "Abstimmung bearbeiten"
 
-#: motion/templates/motion/motion_detail.html:202
+#: motion/templates/motion/motion_detail.html:199
 msgid "Delete Vote"
 msgstr "Abstimmung löschen"
 
-#: motion/templates/motion/motion_detail.html:217
+#: motion/templates/motion/motion_detail.html:214
 msgid "No results"
 msgstr "Keine Ergebnisse"
 
-#: motion/templates/motion/motion_detail.html:228
+#: motion/templates/motion/motion_detail.html:225
 msgid "New vote"
 msgstr "Neue Abstimmung"
 
-#: motion/templates/motion/motion_detail.html:245
+#: motion/templates/motion/motion_detail.html:242
 msgid "Last changes (of this version)"
 msgstr "Letzte Änderung (von dieser Version)"
 
-#: motion/templates/motion/motion_detail.html:247
+#: motion/templates/motion/motion_detail.html:244
 #: motion/templates/motion/motion_diff.html:37
 #: motion/templates/motion/motion_diff.html:41
 #: motion/templates/motion/motion_list.html:46
 msgid "Last changes"
 msgstr "Letzte Änderung"
 
-#: motion/templates/motion/motion_detail.html:258
+#: motion/templates/motion/motion_detail.html:255
 msgid "Withdraw motion"
 msgstr "Antrag zurückziehen"
 
-#: motion/templates/motion/motion_detail.html:267
+#: motion/templates/motion/motion_detail.html:264
 msgid "Unsupport"
 msgstr "Nicht unterstützen"
 
-#: motion/templates/motion/motion_detail.html:273
+#: motion/templates/motion/motion_detail.html:270
 msgid "Support"
 msgstr "Unterstützen"
 
-#: motion/templates/motion/motion_detail.html:281
+#: motion/templates/motion/motion_detail.html:278
 msgid "minimum required supporters"
 msgstr "minimal erforderliche Unterstützer/innen"
 
-#: motion/templates/motion/motion_detail.html:288
+#: motion/templates/motion/motion_detail.html:285
 msgid "Manage motion"
 msgstr "Antrag verwalten"
 
-#: motion/templates/motion/motion_detail.html:296
+#: motion/templates/motion/motion_detail.html:293
 msgid "For administration only:"
 msgstr "Nur zur Administration:"
 
-#: motion/templates/motion/motion_detail.html:298
+#: motion/templates/motion/motion_detail.html:295
 msgid "Reset state"
 msgstr "Status zurücksetzen"
 
@@ -1806,13 +1852,13 @@ msgid "Diff view"
 msgstr "Änderungsanzeige"
 
 #: motion/templates/motion/motion_diff.html:28
-#: motion/templates/motion/motion_form.html:35
+#: motion/templates/motion/motion_form.html:36
 #: motion/templates/motion/poll_form.html:18
 msgid "Back to motion"
 msgstr "Zurück zum Antrag"
 
-#: motion/templates/motion/motion_form.html:22
-#: motion/templates/motion/motion_form.html:31
+#: motion/templates/motion/motion_form.html:23
+#: motion/templates/motion/motion_form.html:32
 #: motion/templates/motion/motion_list.html:24
 msgid "New motion"
 msgstr "Neuer Antrag"
@@ -1825,7 +1871,7 @@ msgstr "Anträge importieren"
 
 #: motion/templates/motion/motion_form_csv_import.html:15
 msgid "Select a CSV file to import motions"
-msgstr "Wählen Sie eine CSV-Datei zum Importieren von Anträgen aus!"
+msgstr "Wählen Sie eine CSV-Datei zum Importieren von Anträgen aus"
 
 #: motion/templates/motion/motion_form_csv_import.html:17
 #: participant/templates/participant/import.html:17
@@ -1848,18 +1894,22 @@ msgid ""
 "Identifier, reason, submitter and category are optional and may be empty"
 msgstr ""
 "Bezeichner, Begründung, Antragsteller und Sachgebiet sind optional und "
-"dürfen leer bleiben."
+"dürfen leer bleiben"
 
-#: motion/templates/motion/motion_form_csv_import.html:27
-msgid "Required CSV file encoding: UTF-8."
-msgstr "Erforderliches Encoding der CSV-Datei: UTF-8."
+#: motion/templates/motion/motion_form_csv_import.html:26
+msgid "The first line (header) is ignored"
+msgstr "Die erste Zeile (Kopfzeile) wird ignoriert"
 
-#: motion/templates/motion/motion_form_csv_import.html:30
+#: motion/templates/motion/motion_form_csv_import.html:28
+msgid "Required CSV file encoding is UTF-8"
+msgstr "Erforderliches Encoding der CSV-Datei ist UTF-8"
+
+#: motion/templates/motion/motion_form_csv_import.html:31
 #: participant/templates/participant/import.html:28
 msgid "Use the CSV example file from OpenSlides Wiki."
 msgstr "Verwenden Sie die CSV-Beispiel-Datei vom OpenSlides Wiki."
 
-#: motion/templates/motion/motion_form_csv_import.html:38
+#: motion/templates/motion/motion_form_csv_import.html:39
 #: motion/templates/motion/motion_list.html:29
 #: participant/templates/participant/import.html:35
 #: participant/templates/participant/overview.html:25
@@ -1898,10 +1948,6 @@ msgstr "Abstimmungsergebnis"
 msgid "No poll results available."
 msgstr "Keine Abstimmungsergebnisse vorhanden."
 
-#: motion/templates/projector/Motion.html:56
-msgid "Motion No."
-msgstr "Antrag Nr."
-
 #: participant/__init__.py:18 participant/signals.py:56
 msgid "Participant"
 msgstr "Teilnehmer"
@@ -1924,9 +1970,9 @@ msgstr "Import auf Grund von schweren Fehlern in der Quelldatei abgebrochen."
 msgid "Import file has wrong character encoding, only UTF-8 is supported!"
 msgstr ""
 "Die Quelldatei benutzt eine ungültige Zeichenkodierung, es wird nur UTF-8 "
-"wird unterstützt!"
+"unterstützt!"
 
-#: participant/forms.py:29 participant/views.py:531
+#: participant/forms.py:29 participant/views.py:542
 #: participant/templates/participant/group_overview.html:7
 #: participant/templates/participant/group_overview.html:20
 #: participant/templates/participant/overview.html:24
@@ -1939,7 +1985,11 @@ msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: participant/forms.py:67
+#: participant/forms.py:44
+msgid "First name and last name can not both be empty."
+msgstr ""
+
+#: participant/forms.py:77
 msgid ""
 "You can not remove the last group containing the permission to manage "
 "participants."
@@ -1947,11 +1997,11 @@ msgstr ""
 "Sie können nicht die letzte Gruppe löschen, die das Recht zur Verwaltung von "
 "Teilnehmern enthält."
 
-#: participant/forms.py:75
+#: participant/forms.py:85
 msgid "Permissions"
 msgstr "Rechte"
 
-#: participant/forms.py:78 participant/views.py:493 participant/views.py:517
+#: participant/forms.py:88 participant/views.py:504 participant/views.py:528
 #: participant/templates/participant/overview.html:7
 #: participant/templates/participant/overview.html:20
 msgid "Participants"
@@ -1965,7 +2015,7 @@ msgstr "Männlich"
 msgid "Female"
 msgstr "Weiblich"
 
-#: participant/models.py:36 participant/views.py:194
+#: participant/models.py:36 participant/views.py:205
 #: participant/templates/participant/overview.html:51
 #: participant/templates/participant/user_detail.html:50
 msgid "Structure level"
@@ -1988,7 +2038,7 @@ msgstr "Geschlecht"
 msgid "Only for filtering the participant list."
 msgstr "Nur zum Filtern der Teilnehmerliste."
 
-#: participant/models.py:45 participant/views.py:194
+#: participant/models.py:45 participant/views.py:205
 #: participant/templates/participant/overview.html:53
 #: participant/templates/participant/user_detail.html:52
 msgid "Committee"
@@ -2063,82 +2113,82 @@ msgstr "Delegierte/r"
 msgid "Staff"
 msgstr "Mitarbeiter/in"
 
-#: participant/views.py:146
+#: participant/views.py:157
 msgid "You can not delete yourself."
 msgstr "Sie dürfen sich nicht selbst löschen."
 
-#: participant/views.py:167
+#: participant/views.py:178
 msgid "You can not deactivate yourself."
 msgstr "Sie dürfen sich nicht selbst deaktivieren."
 
-#: participant/views.py:170
+#: participant/views.py:181
 msgid "You can not deactivate the administrator."
 msgstr "Sie dürfen den Administrator nicht deaktivieren."
 
-#: participant/views.py:189
+#: participant/views.py:200
 msgid "Participant-list"
 msgstr "Teilnehmerliste"
 
-#: participant/views.py:190
+#: participant/views.py:201
 msgid "List of Participants"
 msgstr "Teilnehmerliste"
 
-#: participant/views.py:193 participant/templates/participant/overview.html:50
+#: participant/views.py:204 participant/templates/participant/overview.html:50
 msgid "Last Name"
 msgstr "Nachname"
 
-#: participant/views.py:193 participant/templates/participant/overview.html:49
+#: participant/views.py:204 participant/templates/participant/overview.html:49
 msgid "First Name"
 msgstr "Vorname"
 
-#: participant/views.py:194
+#: participant/views.py:205
 #: participant/templates/participant/group_overview.html:31
 #: participant/templates/participant/overview.html:52
 msgid "Group"
 msgstr "Gruppe"
 
-#: participant/views.py:230
+#: participant/views.py:241
 msgid "Participant-passwords"
 msgstr "Teilnehmer-Passwoerter"
 
-#: participant/views.py:260
+#: participant/views.py:271
 msgid "Account for OpenSlides"
 msgstr "Zugang für OpenSlides"
 
-#: participant/views.py:262
+#: participant/views.py:273
 #, python-format
 msgid "for %s"
 msgstr "für %s"
 
-#: participant/views.py:265
+#: participant/views.py:276
 #, python-format
 msgid "User: %s"
 msgstr "Nutzername: %s"
 
-#: participant/views.py:269
+#: participant/views.py:280
 #, python-format
 msgid "Password: %s"
 msgstr "Passwort: %s"
 
-#: participant/views.py:316
+#: participant/views.py:327
 #, python-format
 msgid "%d new participants were successfully imported."
 msgstr "%d neue Teilnehmer/innen wurden erfolgreich importiert."
 
-#: participant/views.py:327
+#: participant/views.py:338
 msgid "Do you really want to reset the password?"
 msgstr "Soll das Passwort wirklich zurückgesetzt werden?"
 
-#: participant/views.py:340
+#: participant/views.py:351
 #, python-format
 msgid "The Password for %s was successfully reset."
 msgstr "Das Passwort für %s wurde erfolgreich zurückgesetzt."
 
-#: participant/views.py:415
+#: participant/views.py:426
 msgid "You can not delete this Group."
 msgstr "Sie dürfen diese Gruppe nicht löschen."
 
-#: participant/views.py:426
+#: participant/views.py:437
 #, python-format
 msgid ""
 "Installation was successfully! Use %(user)s (password: %(password)s) for "
@@ -2151,11 +2201,11 @@ msgstr ""
 "Sie das Passwort nach der ersten Anmeldung! Anderenfalls erscheint diese "
 "Meldung weiterhin für alle und ist ein Sicherheitsrisiko."
 
-#: participant/views.py:452
+#: participant/views.py:463
 msgid "User settings successfully saved."
 msgstr "Nutzereinstellungen wurden erfolgreich gespeichert."
 
-#: participant/views.py:475
+#: participant/views.py:486
 msgid "Password successfully changed."
 msgstr "Passwort wurde erfolgreich geändert."
 
@@ -2538,11 +2588,6 @@ msgstr "%s wurde erfolgreich bearbeitet."
 msgid "%s was successfully created."
 msgstr "%s wurde erfolgreich angelegt."
 
-#: utils/views.py:379
-#, python-format
-msgid "%s was successfully deleted."
-msgstr "%s wurde erfolgreich gelöscht."
-
 #: utils/views.py:392
 msgid "undefined-filename"
 msgstr "undefinierter-dateiname"
@@ -2551,5 +2596,11 @@ msgstr "undefinierter-dateiname"
 msgid "Enter valid JSON"
 msgstr "Gebe valides JSON ein"
 
+#~ msgid "Go to last version"
+#~ msgstr "Zu letzten Version"
+
+#~ msgid "Motion No."
+#~ msgstr "Antrag Nr."
+
 #~ msgid "Motion status was set to: %s."
 #~ msgstr "Antragsstatus wurde gesetzt auf: %s."
diff --git a/openslides/motion/csv_import.py b/openslides/motion/csv_import.py
index b6a60ab1b..7c6ab4e71 100644
--- a/openslides/motion/csv_import.py
+++ b/openslides/motion/csv_import.py
@@ -19,7 +19,9 @@ import csv
 from django.db import transaction
 from django.utils.translation import ugettext as _, ugettext_noop
 
+from openslides.utils import csv_ext
 from openslides.utils.person.api import Persons
+from openslides.utils.utils import html_strong
 
 from .models import Motion, Category
 
@@ -37,25 +39,33 @@ def import_motions(csv_file, default_submitter, override=False, importing_person
     error_messages = []
     warning_messages = []
     count_success = 0
+    count_lines = 0
 
     # Check encoding
     try:
         csv_file.read().decode('utf8')
     except UnicodeDecodeError:
-        return (0, [_('Encoding error in import file. Ensure using UTF-8.')], [])
+        return (0, [_('Import file has wrong character encoding, only UTF-8 is supported!')], [])
     csv_file.seek(0)
 
     with transaction.commit_on_success():
-        for (line_no, line) in enumerate(csv.reader(csv_file)):
+        dialect = csv.Sniffer().sniff(csv_file.readline())
+        dialect = csv_ext.patchup(dialect)
+        csv_file.seek(0)
+        for (line_no, line) in enumerate(csv.reader(csv_file, dialect=dialect)):
+            warnings = []
             if line_no < 1:
                 # Do not read the header line
                 continue
 
+            count_lines += 1
             # Check format
             try:
                 (identifier, title, text, reason, submitter, category) = line[:6]
             except ValueError:
-                error_messages.append(_('Ignoring malformed line %d in import file.') % (line_no + 1))
+                error_line = html_strong(_('Line %d of import file:') % (line_no + 1))
+                msg = _('Line is malformed. Motion not imported. Please check the required values.')
+                error_messages.append("%s<br>%s" % (error_line, msg))
                 continue
 
             # Check existing motions according to the identifier
@@ -66,7 +76,9 @@ def import_motions(csv_file, default_submitter, override=False, importing_person
                     motion = Motion(identifier=identifier)
                 else:
                     if not override:
-                        error_messages.append(_('Line %d in import file: Ignoring existing motion.') % (line_no + 1))
+                        error_line = html_strong(_('Line %d of import file:') % (line_no + 1))
+                        msg = _('Identifier already exists. Motion not imported.')
+                        error_messages.append("%s<br>%s" % (error_line, msg))
                         continue
             else:
                 motion = Motion()
@@ -79,9 +91,9 @@ def import_motions(csv_file, default_submitter, override=False, importing_person
                 try:
                     motion.category = Category.objects.get(name=category)
                 except Category.DoesNotExist:
-                    error_messages.append(_('Line %d in import file: Category not found.') % (line_no + 1))
+                    warnings.append(_('Category unknown. No category is used.'))
                 except Category.MultipleObjectsReturned:
-                    error_messages.append(_('Line %d in import file: Multiple categories found.') % (line_no + 1))
+                    warnings.append(_('Several suitable categories found. No category is used.'))
             motion.save()
 
             # Add submitter
@@ -90,15 +102,24 @@ def import_motions(csv_file, default_submitter, override=False, importing_person
                 for person in Persons():
                     if person.clean_name == submitter.decode('utf8'):
                         if person_found:
-                            error_messages.append(_('Line %d in import file: Multiple persons found.') % (line_no + 1))
+                            warnings.append(_('Several suitable submitters found.'))
                             person_found = False
                             break
                         else:
                             new_submitter = person
                             person_found = True
             if not person_found:
-                warning_messages.append(_('Line %d in import file: Default submitter is used.') % (line_no + 1))
+                warnings.append(_('Submitter unknown. Default submitter is used.'))
                 new_submitter = default_submitter
+
+            # show summarized warning message for each import line
+            if warnings:
+                warning_line = _('Line %d of import file:') % (line_no + 1)
+                warning_message_string = "%s<ul>" % html_strong(warning_line)
+                for w in warnings:
+                    warning_message_string += "<li>%s</li>" % w
+                warning_message_string += "</ul>"
+                warning_messages.append(warning_message_string)
             motion.clear_submitters()
             motion.add_submitter(new_submitter)
 
@@ -106,4 +127,4 @@ def import_motions(csv_file, default_submitter, override=False, importing_person
                              person=importing_person)
             count_success += 1
 
-    return (count_success, error_messages, warning_messages)
+    return (count_success, count_lines, error_messages, warning_messages)
diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 31cc24488..53dfdd84a 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -734,7 +734,7 @@ class MotionPoll(CountInvalid, CountVotesCast, BasePoll):
 
     def __unicode__(self):
         """Return a string, representing the poll."""
-        return _('Ballot %d') % self.poll_number
+        return _('Vote %d') % self.poll_number
 
     def get_absolute_url(self, link='edit'):
         """Return an URL for the poll.
diff --git a/openslides/motion/pdf.py b/openslides/motion/pdf.py
index 344f81cde..9905fca60 100644
--- a/openslides/motion/pdf.py
+++ b/openslides/motion/pdf.py
@@ -56,7 +56,8 @@ def motion_to_pdf(pdf, motion):
                             stylesheet['Heading4']))
     cell1b = []
     cell1b.append(Spacer(0, 0.2 * cm))
-    cell1b.append(Paragraph(unicode(motion.submitter), stylesheet['Normal']))
+    for submitter in motion.submitter.all():
+        cell1b.append(Paragraph(unicode(submitter), stylesheet['Normal']))
     motion_data.append([cell1a, cell1b])
 
     # TODO: choose this in workflow
@@ -88,26 +89,12 @@ def motion_to_pdf(pdf, motion):
         cell3b.append(Spacer(0, 0.2 * cm))
         motion_data.append([cell3a, cell3b])
 
-    ## # status
-    ## cell4a = []
-    ## cell4b = []
-    ## note = " ".join(motion.notes)
-    ## cell4a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Status"), stylesheet['Heading4']))
-    ## if note != "":
-        ## if motion.status == "pub":
-            ## cell4b.append(Paragraph(note, stylesheet['Normal']))
-        ## else:
-            ## cell4b.append(Paragraph("%s | %s" % (motion.get_status_display(), note), stylesheet['Normal']))
-    ## else:
-        ## cell4b.append(Paragraph("%s" % motion.get_status_display(), stylesheet['Normal']))
-    ## data.append([cell4a, cell4b])
-
     # Motion state
     cell4a = []
     cell4b = []
     cell4a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("State"),
                             stylesheet['Heading4']))
-    cell4b.append(Paragraph(motion.state.name, stylesheet['Normal']))
+    cell4b.append(Paragraph(_(motion.state.name), stylesheet['Normal']))
     motion_data.append([cell4a, cell4b])
 
     # Version number (aid)
@@ -137,7 +124,7 @@ def motion_to_pdf(pdf, motion):
             option = poll.get_options()[0]
             yes, no, abstain, invalid, votecast = (
                 option['Yes'], option['No'], option['Abstain'],
-                poll.print_voteinvalid(), poll.print_votecast())
+                poll.print_votesinvalid(), poll.print_votescast())
 
             if len(polls) > 1:
                 cell6b.append(Paragraph("%s. %s" % (ballotcounter, _("Vote")),
diff --git a/openslides/motion/static/styles/motion.css b/openslides/motion/static/styles/motion.css
index 951f94309..b8335cea9 100644
--- a/openslides/motion/static/styles/motion.css
+++ b/openslides/motion/static/styles/motion.css
@@ -5,6 +5,11 @@
  * :license: GNU GPL, see LICENSE for more details.
  */
 
+/* motion create/update form fields */
+#id_submitter, #id_supporter {
+    height: 110px;
+    width: auto;
+}
 /* motion version diff table */
 table.diff, .diff_row {
     font-size: 12px;
diff --git a/openslides/motion/templates/motion/category_form.html b/openslides/motion/templates/motion/category_form.html
index 421b3a019..facb2d6b0 100644
--- a/openslides/motion/templates/motion/category_form.html
+++ b/openslides/motion/templates/motion/category_form.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 
 {% block title %}
diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html
index 3e98d6ce5..08a4c2aee 100644
--- a/openslides/motion/templates/motion/motion_detail.html
+++ b/openslides/motion/templates/motion/motion_detail.html
@@ -21,7 +21,7 @@
     </small>
     <small class="pull-right">
         <a href="{% url 'motion_list' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
-        <a href="{% url 'motion_detail_pdf' motion.id  %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print motion as PDF' %}"><i class="icon-print"></i> PDF</a>
+        <a href="{% url 'motion_detail_pdf' motion.id  %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print motion as PDF' %}" target="_blank"><i class="icon-print"></i> PDF</a>
         <!-- activate projector -->
         {% if perms.projector.can_manage_projector %}
             <a href="{% url 'projector_activate_slide' motion.sid  %}" class="activate_link btn {% if motion.active %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show motion' %}">
@@ -184,11 +184,8 @@
 
         <!-- Status -->
         <h5>{% trans "Status" %}:</h5>
-        {% if motion.state_id != "pub" %}
-            {# TODO: trans motion.state #}
-            <span class="label label-info">{% trans motion.state.name %}</span>
-            <br>
-        {% endif %}
+        <span class="label label-info">{% trans motion.state.name %}</span>
+        <br>
 
         <!-- Vote results -->
         <h5>{% trans "Vote results" %}:</h5>
diff --git a/openslides/motion/templates/motion/motion_diff.html b/openslides/motion/templates/motion/motion_diff.html
index a390596fc..c9d0720e2 100644
--- a/openslides/motion/templates/motion/motion_diff.html
+++ b/openslides/motion/templates/motion/motion_diff.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load staticfiles %}
 
diff --git a/openslides/motion/templates/motion/motion_form.html b/openslides/motion/templates/motion/motion_form.html
index 72bb29bdb..a214bb8f4 100644
--- a/openslides/motion/templates/motion/motion_form.html
+++ b/openslides/motion/templates/motion/motion_form.html
@@ -6,6 +6,7 @@
 {% load staticfiles %}
 
 {% block header %}
+    <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/motion.css' %}" />
     <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/ckeditor.css' %}" />
 {% endblock %}
 
diff --git a/openslides/motion/templates/motion/motion_list.html b/openslides/motion/templates/motion/motion_list.html
index a551dce93..b7b78bc59 100644
--- a/openslides/motion/templates/motion/motion_list.html
+++ b/openslides/motion/templates/motion/motion_list.html
@@ -28,7 +28,7 @@
             <a href="{% url 'motion_category_list' %}" class="btn btn-mini"><i class="icon-th-large"></i> {% trans 'Categories' %}</a>
             <a href="{% url 'motion_csv_import' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-import"></i> {% trans 'Import' %}</a>
         {% endif %}
-        <a href="{% url 'motion_list_pdf' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all motions as PDF' %}"><i class="icon-print"></i> PDF</a>
+        <a href="{% url 'motion_list_pdf' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all motions as PDF' %}" target="_blank"><i class="icon-print"></i> PDF</a>
         </small>
     </h1>
 
@@ -86,7 +86,7 @@
                         <i class="icon-remove"></i>
                     </a>
                 {% endif %}
-                <a href="{% url 'motion_detail_pdf' motion.id  %}" class="btn btn-mini" title="{% trans 'Print motion as PDF' %}">
+                <a href="{% url 'motion_detail_pdf' motion.id  %}" class="btn btn-mini" title="{% trans 'Print motion as PDF' %}" target="_blank">
                     <i class="icon-print"></i> PDF
                 </a>
                 </span>
diff --git a/openslides/motion/templates/motion/poll_form.html b/openslides/motion/templates/motion/poll_form.html
index 41fe25eeb..d7ed0a446 100644
--- a/openslides/motion/templates/motion/poll_form.html
+++ b/openslides/motion/templates/motion/poll_form.html
@@ -57,7 +57,7 @@
 
 <!-- ballot paper button -->
 <p>
-<a href="{% url 'motion_poll_pdf' motion.id poll.poll_number %}" class="btn">
+<a href="{% url 'motion_poll_pdf' motion.id poll.poll_number %}" class="btn" target="_blank">
     <i class="icon-print"></i> {% trans 'Ballot paper as PDF' %}
 </a>
 </p>
diff --git a/openslides/motion/templates/projector/Motion.html b/openslides/motion/templates/projector/Motion.html
index 66037a134..ce27266dc 100644
--- a/openslides/motion/templates/projector/Motion.html
+++ b/openslides/motion/templates/projector/Motion.html
@@ -1,6 +1,5 @@
 {% extends "base-projector.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load staticfiles %}
 
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 213f1db9e..eef3f0e2c 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -707,7 +707,7 @@ class MotionCSVImportView(FormView):
         """
         Processes the import function.
         """
-        count_success, error_messages, warning_messages = import_motions(
+        count_success, count_lines, error_messages, warning_messages = import_motions(
             self.request.FILES['csvfile'],
             default_submitter=form.cleaned_data['default_submitter'],
             override=form.cleaned_data['override'],
@@ -719,7 +719,7 @@ class MotionCSVImportView(FormView):
         if count_success:
             messages.success(
                 self.request,
-                _('%d motions were successfully imported.') % count_success)
+                "<strong>%s</strong><br>%s" % (_('Summary'), _('%d of %d motions successfully imported.') % (count_success, count_lines)))
         return super(MotionCSVImportView, self).form_valid(form)
 
 motion_csv_import = MotionCSVImportView.as_view()
diff --git a/openslides/participant/templates/participant/group_widget.html b/openslides/participant/templates/participant/group_widget.html
index 40adca27d..8f418dc6f 100644
--- a/openslides/participant/templates/participant/group_widget.html
+++ b/openslides/participant/templates/participant/group_widget.html
@@ -3,7 +3,6 @@
 
 <ul style="line-height: 180%">
 {% for group in groups %}
-    {% if group.pk != 1 and group.pk != 2 %}
     <li class="{% if group.active %}activeline{% endif %}">
         <a href="{% url 'projector_activate_slide' group.sid  %}" class="activate_link btn {% if group.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
             <i class="icon-facetime-video {% if group.active %}icon-white{% endif %}"></i>
@@ -14,10 +13,7 @@
         <a href="{% url 'projctor_preview_slide' group.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
             <i class="icon-search"></i>
         </a>
-        <a href="{% model_url group 'view' %}">{{ group }}</a>
+        <a href="{% model_url group 'view' %}">{% trans group.name %}</a>
     </li>
-    {% endif %}
-{% empty %}
-    <li>{% trans 'No groups available.' %}</li>
 {% endfor %}
 </ul>
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index 11662617d..e277c1c9d 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -31,12 +31,12 @@
                 </a>
                 <ul class="dropdown-menu  pull-right">
                     {% url 'user_settings' as url_usersettings %}
-                    <li><a href="{% url 'user_print' %}"><i class="icon-list"></i> {% trans 'List of participants' %}</a></li>
-                    <li><a href="{% url 'print_passwords' %}"><i class="icon-th-large"></i> {% trans 'First time passwords' %}</a></li>
+                    <li><a href="{% url 'user_print' %}" target="_blank"><i class="icon-list"></i> {% trans 'List of participants' %}</a></li>
+                    <li><a href="{% url 'print_passwords' %}" target="_blank"><i class="icon-th-large"></i> {% trans 'First time passwords' %}</a></li>
                 </ul>
             </div>
         {% else %}
-            <a href="{% url 'user_print' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print list of participants as PDF' %}"><i class="icon-print"></i> PDF</a>
+            <a href="{% url 'user_print' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print list of participants as PDF' %}" target="_blank"><i class="icon-print"></i> PDF</a>
         {% endif %}
         </small>
     </h1>
diff --git a/openslides/participant/templates/participant/user_detail.html b/openslides/participant/templates/participant/user_detail.html
index a19289414..50a384da2 100644
--- a/openslides/participant/templates/participant/user_detail.html
+++ b/openslides/participant/templates/participant/user_detail.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
 {% load i18n %}
-{% load tags %}
 
 {% block title %}{{ block.super }} – {{ shown_user }}{% endblock %}
 
diff --git a/openslides/participant/templates/projector/GroupSlide.html b/openslides/participant/templates/projector/GroupSlide.html
index 3de117e95..742d624fd 100644
--- a/openslides/participant/templates/projector/GroupSlide.html
+++ b/openslides/participant/templates/projector/GroupSlide.html
@@ -1,22 +1,13 @@
 {% extends "base-projector.html" %}
 
 {% load i18n %}
-{% load tags %}
 
 {% block title %}{{ block.super }} - {{ title }}{% endblock %}
 
 {% block content %}
-    <div class="item_fullscreen">{{ group }}
+    <div class="item_fullscreen">{% trans group.name %}
         <span>
         <p><i>{{ group.user_set.all.count }} {% trans "participants" %}</i></p>
-        {% comment %}
-            TODO: print fullname (not username) of all group users [see #420]
-            <p>
-                {% if group.user_set.all %}
-                    {{ group.user_set.all|join:", " }}
-                {% endif %}
-            </p>
-        {% endcomment %}
         </span>
     </div>
 {% endblock %}
diff --git a/openslides/participant/templates/projector/UserSlide.html b/openslides/participant/templates/projector/UserSlide.html
index c338cda02..4c426a8ee 100644
--- a/openslides/participant/templates/projector/UserSlide.html
+++ b/openslides/participant/templates/projector/UserSlide.html
@@ -1,7 +1,6 @@
 {% extends "base-projector.html" %}
 
 {% load i18n %}
-{% load tags %}
 
 {% block title %}{{ block.super }} - {{ title }}{% endblock %}
 
@@ -13,7 +12,9 @@
         {% endif %}
         <p>
             {% if shown_user.groups.all %}
-                {{ shown_user.groups.all|join:", " }}
+                {% for group in shown_user.groups.all %}
+                    {% trans group.name %}{% if not forloop.last %}, {% endif %}
+                {% endfor %}
             {% endif %}
         </p>
         </span>
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 2eb9ecfb1..708b9fdb6 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -132,6 +132,17 @@ class UserUpdateView(UpdateView):
         form_kwargs.update({'request': self.request})
         return form_kwargs
 
+    def post_save(self, form):
+        super(UserUpdateView, self).post_save(form)
+        # TODO: find a better solution that makes the following lines obsolete
+        # Background: motion.models.use_post_save adds already the registerd group
+        # to new user but super(..).post_save(form) removes it and sets only the
+        # groups selected in the form (without 'registered')
+        # workaround: add registered group again manually
+        from openslides.participant.api import get_registered_group  # TODO: Test, if global import is possible
+        registered = get_registered_group()
+        self.object.groups.add(registered)
+
 
 class UserDeleteView(DeleteView):
     """
diff --git a/openslides/projector/templates/base-projector.html b/openslides/projector/templates/base-projector.html
index 27cfc9e92..ae086fce8 100644
--- a/openslides/projector/templates/base-projector.html
+++ b/openslides/projector/templates/base-projector.html
@@ -1,10 +1,8 @@
 {% load tags %}
 {% load staticfiles %}
 
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!DOCTYPE html>
+<html lang="{{LANGUAGE_CODE}}">
     <head>
         <link type="text/css" rel="stylesheet" href="{% static 'styles/projector.css' %}">
         <link rel="shortcut icon" href="{% static 'img/favicon.png' %}" type="image/png" />
diff --git a/openslides/projector/templates/projector/dashboard.html b/openslides/projector/templates/projector/dashboard.html
index 11532e60f..cadcc45d3 100644
--- a/openslides/projector/templates/projector/dashboard.html
+++ b/openslides/projector/templates/projector/dashboard.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load staticfiles %}
 
diff --git a/openslides/projector/templates/projector/live_view_widget.html b/openslides/projector/templates/projector/live_view_widget.html
index fff19fb7c..3c48813a1 100644
--- a/openslides/projector/templates/projector/live_view_widget.html
+++ b/openslides/projector/templates/projector/live_view_widget.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 <!-- projector control buttons -->
 {% if perms.projector.can_manage_projector %}
diff --git a/openslides/projector/templates/projector/new.html b/openslides/projector/templates/projector/new.html
index f61e5a049..d7d0c0144 100644
--- a/openslides/projector/templates/projector/new.html
+++ b/openslides/projector/templates/projector/new.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 
 {% block title %}{{ block.super }} – {% trans "Custom slide" %}{% endblock %}
diff --git a/openslides/projector/templates/projector/overlay_countdown_widget.html b/openslides/projector/templates/projector/overlay_countdown_widget.html
index c79e4fc40..22152373e 100644
--- a/openslides/projector/templates/projector/overlay_countdown_widget.html
+++ b/openslides/projector/templates/projector/overlay_countdown_widget.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 <span>
     {% trans "Countdown for speaking time" %}:
diff --git a/openslides/projector/templates/projector/overlay_widget.html b/openslides/projector/templates/projector/overlay_widget.html
index 006136248..e132da98c 100644
--- a/openslides/projector/templates/projector/overlay_widget.html
+++ b/openslides/projector/templates/projector/overlay_widget.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 <ul class="overlay_list">
     {% for overlay in overlays %}
diff --git a/openslides/projector/templates/projector/welcome_widget.html b/openslides/projector/templates/projector/welcome_widget.html
index 68461cacb..95917be00 100644
--- a/openslides/projector/templates/projector/welcome_widget.html
+++ b/openslides/projector/templates/projector/welcome_widget.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 {% if welcometext %}
     <p>{{ welcometext|safe|linebreaks }}</p>
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 8430031f3..ce8ea5b33 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -167,17 +167,17 @@ legend + .control-group {
     height: 310px;
     width: auto;
 }
-#id_submitter, #id_supporter, #id_users {
+#id_users {
     height: 110px;
     width: auto;
 }
-#dataTableParticipants_filter input {
+#dataTable_filter input {
     width: auto;
 }
-#dataTableParticipants {
+#dataTable {
     clear: none;
 }
-#dataTableParticipants_wrapper .row-fluid:after {
+#dataTable_wrapper .row-fluid:after {
     clear: none;
 }
 
diff --git a/openslides/templates/403.html b/openslides/templates/403.html
index acb867cbb..c21b8cb3c 100644
--- a/openslides/templates/403.html
+++ b/openslides/templates/403.html
@@ -1,8 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
-{% load i18n %}
-
 {% block content %}
     <h1>{{ error }}</h1>
 {% endblock %}
diff --git a/openslides/templates/404.html b/openslides/templates/404.html
index ba0690928..4aeb91eb7 100644
--- a/openslides/templates/404.html
+++ b/openslides/templates/404.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 
 {% block content %}
diff --git a/openslides/templates/500.html b/openslides/templates/500.html
index 4469ff3b0..3fd96db4a 100644
--- a/openslides/templates/500.html
+++ b/openslides/templates/500.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 
 {% block content %}
diff --git a/openslides/templates/base.html b/openslides/templates/base.html
index dbfb66681..e424910e9 100644
--- a/openslides/templates/base.html
+++ b/openslides/templates/base.html
@@ -2,10 +2,8 @@
 {% load i18n %}
 {% load staticfiles %}
 
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!DOCTYPE html>
+<html lang="{{LANGUAGE_CODE}}">
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -26,7 +24,7 @@
         <div class="row-fluid">
             <div class="span12">
                 <div id="header">
-                    <a href="/" class="logo" title="{% trans 'Home' %}"><img src="{% static 'img/logo.png' %}" /></a>
+                    <a href="/" class="logo" title="{% trans 'Home' %}"><img src="{% static 'img/logo.png' %}" alt="{% trans 'Logo' %}" /></a>
                     <span class="title optional">{% get_config 'event_name' %} – {% get_config 'event_description' %}</span>
                     {% block loginbutton %}
                     <div class="btn-group pull-right">
diff --git a/openslides/utils/templatetags/tags.py b/openslides/utils/templatetags/tags.py
index 7563ebfb2..87c17e4e1 100644
--- a/openslides/utils/templatetags/tags.py
+++ b/openslides/utils/templatetags/tags.py
@@ -27,13 +27,6 @@ def get_config(key):
     return config[key]
 
 
-@register.simple_tag
-def active(request, pattern):
-    if request.path.startswith(pattern):
-        return 'selected'
-    return ''
-
-
 @register.simple_tag
 def model_url(object, link='view'):
     # TODO: Rename to object_url
diff --git a/tests/motion/test_csv_import.py b/tests/motion/test_csv_import.py
index c7705ecd0..32e1e1103 100644
--- a/tests/motion/test_csv_import.py
+++ b/tests/motion/test_csv_import.py
@@ -56,7 +56,7 @@ class CSVImport(TestCase):
         csv_dir = os.path.join(os.path.dirname(__file__), '..', '..', 'extras', 'csv-examples')
         self.assertEqual(Motion.objects.count(), 0)
         with open(csv_dir + '/motions-demo_de.csv') as f:
-            count_success, error_messages, warning_messages = import_motions(csv_file=f, default_submitter=self.normal_user.person_id)
+            count_success, count_lines, error_messages, warning_messages = import_motions(csv_file=f, default_submitter=self.normal_user.person_id)
         self.assertEqual(Motion.objects.count(), 4)
         self.assertEqual(count_success, 4)
 
@@ -68,8 +68,8 @@ class CSVImport(TestCase):
         self.assertEqual(len(motion1.submitter.all()), 1)
         self.assertEqual(motion1.submitter.all()[0].person, self.normal_user)
         self.assertTrue(motion1.category is None)
-        self.assertTrue('Line 2 in import file: Default submitter is used.' in warning_messages)
-        self.assertTrue('Line 2 in import file: Category not found.' in error_messages)
+        self.assertTrue(any('Submitter unknown.' in w for w in warning_messages))
+        self.assertTrue(any('Category unknown.' in w for w in warning_messages))
 
         motion2 = Motion.objects.get(pk=2)
         self.assertEqual(motion2.identifier, 'S 2')
@@ -81,15 +81,15 @@ class CSVImport(TestCase):
         self.assertEqual(motion2.submitter.all()[0].person, special_user)
         self.assertEqual(motion2.category, self.category1)
 
-        self.assertTrue('Line 5 in import file: Multiple persons found.' in error_messages)
-        self.assertTrue('Line 5 in import file: Multiple categories found.' in error_messages)
+        self.assertTrue(any('Several suitable submitters found.' in w for w in warning_messages))
+        self.assertTrue(any('Several suitable categories found.' in w for w in warning_messages))
 
     def test_malformed_file(self):
         csv_file = StringIO.StringIO()
         csv_file.write('Header\nMalformed data,\n,Title,Text,,,\n')
-        count_success, error_messages, warning_messages = import_motions(csv_file=csv_file, default_submitter=self.normal_user.person_id)
-        self.assertEqual(count_success, 1)
-        self.assertTrue('Ignoring malformed line 2 in import file.' in error_messages)
+        count_success, count_lines, error_messages, warning_messages = import_motions(csv_file=csv_file, default_submitter=self.normal_user.person_id)
+        self.assertEqual(count_success, 0)
+        self.assertTrue(any('Line is malformed.' in e for e in error_messages))
 
     def test_wrong_encoding(self):
         csv_file = StringIO.StringIO()
@@ -98,4 +98,4 @@ class CSVImport(TestCase):
         csv_file.seek(0)
         count_success, error_messages, warning_messages = import_motions(csv_file=csv_file, default_submitter=self.normal_user.person_id)
         self.assertEqual(count_success, 0)
-        self.assertTrue('Encoding error in import file. Ensure using UTF-8.' in error_messages)
+        self.assertTrue('Import file has wrong character encoding, only UTF-8 is supported!' in error_messages)