diff --git a/openslides/agenda/templates/agenda/base_agenda.html b/openslides/agenda/templates/agenda/base_agenda.html
index 8b4f73db0..457b531f8 100644
--- a/openslides/agenda/templates/agenda/base_agenda.html
+++ b/openslides/agenda/templates/agenda/base_agenda.html
@@ -11,7 +11,7 @@
{%trans "New item" %}
{% endif %}
{% if perms.agenda.can_see_projector %}
- {%trans 'Projector view' %}
+ {%trans 'Projector view' %}
{% endif %}
{% endblock %}
diff --git a/openslides/beamer/templates/beamer.html b/openslides/agenda/templates/beamer.html
similarity index 100%
rename from openslides/beamer/templates/beamer.html
rename to openslides/agenda/templates/beamer.html
diff --git a/openslides/beamer/templates/beamer/ItemApplication.html b/openslides/agenda/templates/beamer/ItemApplication.html
similarity index 100%
rename from openslides/beamer/templates/beamer/ItemApplication.html
rename to openslides/agenda/templates/beamer/ItemApplication.html
diff --git a/openslides/beamer/templates/beamer/ItemAssignment.html b/openslides/agenda/templates/beamer/ItemAssignment.html
similarity index 100%
rename from openslides/beamer/templates/beamer/ItemAssignment.html
rename to openslides/agenda/templates/beamer/ItemAssignment.html
diff --git a/openslides/beamer/templates/beamer/ItemPoll.html b/openslides/agenda/templates/beamer/ItemPoll.html
similarity index 100%
rename from openslides/beamer/templates/beamer/ItemPoll.html
rename to openslides/agenda/templates/beamer/ItemPoll.html
diff --git a/openslides/beamer/templates/beamer/ItemText.html b/openslides/agenda/templates/beamer/ItemText.html
similarity index 100%
rename from openslides/beamer/templates/beamer/ItemText.html
rename to openslides/agenda/templates/beamer/ItemText.html
diff --git a/openslides/beamer/templates/beamer/overview.html b/openslides/agenda/templates/beamer/overview.html
similarity index 100%
rename from openslides/beamer/templates/beamer/overview.html
rename to openslides/agenda/templates/beamer/overview.html
diff --git a/openslides/agenda/urls.py b/openslides/agenda/urls.py
index e890540db..c04888ee1 100644
--- a/openslides/agenda/urls.py
+++ b/openslides/agenda/urls.py
@@ -13,6 +13,9 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('agenda.views',
+ url(r'^beamer/$', 'beamer',
+ name='item_beamer'),
+
url(r'^$', 'overview'),
url(r'^agenda/$', 'overview',
@@ -53,4 +56,24 @@ urlpatterns = patterns('agenda.views',
url(r'^agenda/print/$', 'print_agenda',
name='print_agenda'),
+
+ url(r'^beamer/bigger$', 'beamer_edit', {'direction': 'bigger'}, name='beamer_bigger'),
+
+ url(r'^beamer/smaller$', 'beamer_edit', {'direction': 'smaller'}, name='beamer_smaller'),
+
+ url(r'^beamer/up$', 'beamer_edit', {'direction': 'up'}, name='beamer_up'),
+
+ url(r'^beamer/down$', 'beamer_edit', {'direction': 'down'}, name='beamer_down'),
+
+ url(r'^beamer/clean$', 'beamer_edit', {'direction': 'clean'}, name='beamer_clean'),
+
+ url(r'^beamer/countdown/show$', 'beamer_countdown', {'command': 'show'}, name='countdown_open'),
+
+ url(r'^beamer/countdown/hide$', 'beamer_countdown', {'command': 'hide'}, name='countdown_close'),
+
+ url(r'^beamer/countdown/reset/(?P