diff --git a/src/plainui/jinja2/plainui/assembly.html b/src/plainui/jinja2/plainui/assembly.html
index 24a10f6b9fbc9c720cdd215cea6cd3f33647bcd5..1906c847208f3ec3c5ba1c660886f59cfc9fcf9d 100644
--- a/src/plainui/jinja2/plainui/assembly.html
+++ b/src/plainui/jinja2/plainui/assembly.html
@@ -5,6 +5,7 @@
 {% import "plainui/components/list_events.html" as list_events with context %}
 {% import "plainui/components/list_rooms.html" as list_rooms with context %}
 {% import "plainui/components/image.html" as imageMacro %}
+{% import "plainui/components/badge_elements.html" as badge_elements with context %}
 
 
 {% block title %}{{conf.name}} - Assembly {{assembly.name}}{% endblock %}
@@ -66,6 +67,20 @@
 
     <hr class="my-8">
 
+    <h2>{{ _("assembly badges") }}</h2>
+    <div class="border p-6">
+        <div class="row">
+            {% if not badges %}
+                {{ _("No badges publicly available.") }}
+            {% endif %}
+            {% for badge_link in badges %}
+                {{ badge_elements.badge(badge_link) }}
+            {% endfor %}
+        </div>
+    </div>
+
+    <hr class="my-8">
+
     <h2>{{ _("Self-organized Sessions") }}</h2>
     {% if can_create_sos -%}
         <a class="btn btn-secondary mb-2 " href="{{ url('plainui:sos_new', conf_slug=conf.slug, assembly_slug=assembly.slug) }}">{{ _("new Self-organized Session") }}</a>
diff --git a/src/plainui/jinja2/plainui/ccc_events.html b/src/plainui/jinja2/plainui/ccc_events.html
index 6eabfe0848a2dac4f00713d307291078606530a4..490af27ff9bbd5ec0719b2638f84c87164a9baed 100644
--- a/src/plainui/jinja2/plainui/ccc_events.html
+++ b/src/plainui/jinja2/plainui/ccc_events.html
@@ -1,6 +1,7 @@
 {% extends "plainui/base.html" %}
 {% import "plainui/components/markdown.html" as markdownMacro %}
 {% import "plainui/components/list_events.html" as listEventsMacro with context %}
+{% from "plainui/components/calendar.html" import calendar with context %}
 {% block head %}
     <script src="{{ static('plainui/js/player.js') }}"></script>
 {% endblock %}
@@ -20,5 +21,15 @@
 
     {{ markdownMacro.markdown(markdown=page.rendered_body|safe) }}
 
+    <hr class="my-8">
+
+    <div class="d-flex mb-8">
+        <a href="{{ url('plainui:public_fahrplan', conf_slug=conf.slug) }}" target="_blank" role="button" class="mr-2 btn btn-secondary">
+            {{ _('Fahrplan in new Tab') }}
+        </a>
+    </div>
+
+    {{ calendar(events, [], [], public=True) }}
+
     <hr class="my-11 border-top-0">
 {% endblock %}
diff --git a/src/plainui/jinja2/plainui/components/badge_elements.html b/src/plainui/jinja2/plainui/components/badge_elements.html
index 96e2352b51425f49efbc362fc48df6bb91872af4..ea6d91c41f322a6c5504fafd8f30bc6a512380ec 100644
--- a/src/plainui/jinja2/plainui/components/badge_elements.html
+++ b/src/plainui/jinja2/plainui/components/badge_elements.html
@@ -1,5 +1,5 @@
 {% import "plainui/components/form_elements.html" as form_elements %}
-{% macro badge(badge_link, showButtons, showRest) -%}
+{% macro userBadge(badge_link, showButtons, showRest) -%}
 {% if badge_link %}
     <div class="col-3 p-2" style="max-width: 256px!important; width: 256px!important;"> 
         <div class="card box-shadow w-100">
@@ -66,4 +66,33 @@
         </div>
     </div>
 {% endif %}
+{%- endmacro %}
+
+{% macro badge(badge) -%}
+{% if badge %}
+    <div class="col-3 p-2" style="max-width: 256px!important; width: 256px!important;"> 
+        <div class="card box-shadow w-100">
+        <div >
+            {% if badge.image %}
+                <img class="card-img-top"
+                alt="Thumbnail Badge {{badge.name}}"
+                style=" width: 254px; height: 254px; display: block;"
+                src="{{badge.image.url}}"
+                data-holder-rendered="true">
+            {% else %}
+                <img class="card-img-top"
+                alt="Thumbnail Badge {{badge.name}}"
+                style="height: 254px; width: 254px; display: block;"
+                src="/static/plainui/img/rc3-no-avatar-plattform-active.jpeg"
+                data-holder-rendered="true">
+            {% endif %}
+        </div>
+        <div class="card-body">
+            <p class="card-text text-center">
+                <h4 class=" m-2">{{badge.name}}</h4>
+            </p>
+        </div>
+        </div>
+    </div>
+{% endif %}
 {%- endmacro %}
\ No newline at end of file
diff --git a/src/plainui/jinja2/plainui/manage_badges.html b/src/plainui/jinja2/plainui/manage_badges.html
index 4d70d2ee4c4f41710677dfa334b7735b0f8e75fa..4af424272496b741397615be04d3c7fb190ea902 100644
--- a/src/plainui/jinja2/plainui/manage_badges.html
+++ b/src/plainui/jinja2/plainui/manage_badges.html
@@ -27,7 +27,7 @@
             </div>
         {% endif %}
         {% for badge_link in badges_accepted %}
-            {{ badge_elements.badge(badge_link, True) }}
+            {{ badge_elements.userBadge(badge_link, True) }}
         {% endfor %}
     </div>
 
@@ -49,7 +49,7 @@
             </div>
         {% endif %}
         {% for badge_link in badges_not_accepted %}
-            {{ badge_elements.badge(badge_link, True) }}
+            {{ badge_elements.userBadge(badge_link, True) }}
         {% endfor %}
     </div>
 
diff --git a/src/plainui/jinja2/plainui/profile.html b/src/plainui/jinja2/plainui/profile.html
index 6d2a94114febeda9ccdc3d9938c81241f62947da..191eb4a5ec601aba3686ab6657cb14b76395fa88 100644
--- a/src/plainui/jinja2/plainui/profile.html
+++ b/src/plainui/jinja2/plainui/profile.html
@@ -67,7 +67,7 @@
             </div>
         {% endif %}
         {% for badge_link in badges %}
-            {{ badge_elements.badge(badge_link, False, True) }}
+            {{ badge_elements.userBadge(badge_link, False, True) }}
         {% endfor %}
     </div>
 
diff --git a/src/plainui/jinja2/plainui/user.html b/src/plainui/jinja2/plainui/user.html
index 734a37e784db79aadedefad0b60850791b69fe52..1b483cb08a66ccaf2090250dd65e926d03907bf1 100644
--- a/src/plainui/jinja2/plainui/user.html
+++ b/src/plainui/jinja2/plainui/user.html
@@ -82,7 +82,7 @@
             </div>
         {% endif %}
         {% for badge_link in badges %}
-            {{ badge_elements.badge(badge_link, False, False) }}
+            {{ badge_elements.userBadge(badge_link, False, False) }}
         {% endfor %}
     </div>
 </div>
diff --git a/src/plainui/locale/de/LC_MESSAGES/django.po b/src/plainui/locale/de/LC_MESSAGES/django.po
index c01ac726c0885be48ecefdf0c44ed74b1f470060..08786f946453bef2ce15d44fa19fc0e7860ad028 100644
--- a/src/plainui/locale/de/LC_MESSAGES/django.po
+++ b/src/plainui/locale/de/LC_MESSAGES/django.po
@@ -39,6 +39,28 @@ msgstr ""
 msgid "Your Username will be visible to other users"
 msgstr "Dein Nutzername wird für andere sichtbar sein"
 
+#, fuzzy
+#| msgid "username"
+msgid "Username"
+msgstr "Benutzername"
+
+msgid "Please enter the Username that used this Ticket and your new Password"
+msgstr "Bitte Usernamen verwenden der dieses Ticket benutzt hat und Dein neues Passwort"
+
+#, fuzzy
+#| msgid "Unknown User!"
+msgid "Unknown User"
+msgstr "Unbekannter Nutzer!"
+
+msgid "User is not active!"
+msgstr "User ist nich aktiv"
+
+msgid "User can use password reset by email!"
+msgstr "Paswort über E-Mail reset ist möglich"
+
+msgid "User didn't use this Ticket!"
+msgstr "Dieser Benutzer ist nicht mit diesem Ticket verknüpft."
+
 msgid "blocked"
 msgstr "blockiert"
 
@@ -117,9 +139,22 @@ msgstr "Laufende und kommende Events"
 msgid "All Assemblies Events"
 msgstr "Alle Assembly-Events"
 
+#, fuzzy
+#| msgid "Contact Us"
+msgid "Contacts"
+msgstr "Kontakt"
+
 msgid "assembly rooms"
 msgstr "Assembly Räume"
 
+#, fuzzy
+#| msgid "Assembly Page"
+msgid "assembly badges"
+msgstr "Assembly Events"
+
+msgid "No badges publicly available."
+msgstr "Es sind keine Badges öffentlich verfügbar. "
+
 msgid "Self-organized Sessions"
 msgstr ""
 
@@ -133,7 +168,7 @@ msgid "Contact Us"
 msgstr "Kontakt"
 
 msgid "Privacy Policy"
-msgstr ""
+msgstr "Datenschutzerklärung"
 
 msgid "About RC3"
 msgstr "Über die rC3"
@@ -141,6 +176,9 @@ msgstr "Über die rC3"
 msgid "Disclaimer"
 msgstr "Impressum"
 
+msgid "Principles"
+msgstr "Spielregeln"
+
 msgid "Bulletin Board"
 msgstr ""
 
@@ -162,6 +200,21 @@ msgstr "Speichern"
 msgid "Public Bulletin Board"
 msgstr "Öffentliches Bulletin Board"
 
+msgid "Fahrplan in new Tab"
+msgstr "Fahrplan in neuem Tab"
+
+msgid "Revoke Badge"
+msgstr "Widerrufen"
+
+msgid "Accept Badge"
+msgstr "Akzeptieren"
+
+msgid "Visibility"
+msgstr "Sichtbarkeit"
+
+msgid "Save visibility"
+msgstr "Sichtbarkeit speichern"
+
 msgid "No entries available."
 msgstr "Keine Einträge vorhanden."
 
@@ -221,7 +274,7 @@ msgstr ""
 
 #, python-format
 msgid "%(kind)s Event on Track"
-msgstr ""
+msgstr "%(kind)s Event auf Track"
 
 msgid "Coming Up Next"
 msgstr "Als nächstes"
@@ -381,6 +434,24 @@ msgstr "Neues Ticket"
 msgid "Login"
 msgstr ""
 
+msgid "Accepted Badges"
+msgstr "Akzeptierte Badges"
+
+msgid "No badges Accepted."
+msgstr "Keine Badges akzeptiert"
+
+msgid "Redeem Badge Token"
+msgstr "Redeem Badge Token"
+
+msgid "Pending Badges"
+msgstr "Ausstehende Badges"
+
+msgid "No badges are waiting for approval."
+msgstr "Hier warten gerade keine Badges auf dich."
+
+msgid "Redeem Token"
+msgstr "Token einlösen"
+
 msgid "Change Password"
 msgstr "Passwort ändern"
 
@@ -483,11 +554,19 @@ msgstr "Persönliche Einstellungen"
 msgid "save"
 msgstr "speichern"
 
-msgid "Badge-Token"
-msgstr ""
+msgid "My Badges"
+msgstr "Meine Badges"
+
+msgid "Manage Badges"
+msgstr "Badgeverwaltung"
 
-msgid "Submit"
-msgstr "Abschicken"
+#, fuzzy
+#| msgid "Pending Badges"
+msgid "Pending badges"
+msgstr "Ausstehende Badges"
+
+msgid "Badges: Accept / Revoke / Visibility"
+msgstr "Badges: Akzeptieren / Widerrufen / Sichtbarkeit"
 
 msgid "My Favorites"
 msgstr "Meine Favoriten"
@@ -501,6 +580,9 @@ msgstr "Nein"
 msgid "Yes"
 msgstr "Ja"
 
+msgid "Use Token for Password Reset"
+msgstr "Benutze ein Token zum Passwort zurück setzten"
+
 msgid "Submit Token"
 msgstr "Token einlösen"
 
@@ -519,6 +601,9 @@ msgstr "Du hast bereits ein Konto? Hier anmelden"
 msgid "Add your Ticket to this existing Account"
 msgstr "Ihr Ticket zu diesem bestehenden Konto hinzufügen"
 
+msgid "User accounts from signup.c3assemblies.de and maschinenraum.rc3.world are imported and can be used to login."
+msgstr "Accounts die auf signup.c3assemblies.de und maschinenraum.rc3.world bereits angelegt wurden, können weiter verwendet werden."
+
 msgid "Please go to the following page and choose a new password:"
 msgstr "Bitte gehen Sie auf die folgende Seite und wählen Sie ein neues Passwort:"
 
@@ -560,6 +645,9 @@ msgstr "zurück"
 msgid "Update"
 msgstr "Update"
 
+msgid "Password Reset"
+msgstr ""
+
 msgid "Upcoming"
 msgstr "Demnächst"
 
@@ -581,9 +669,6 @@ msgstr "PN senden"
 msgid "badges"
 msgstr "Badges"
 
-msgid "no Badges availaible"
-msgstr "Keine Badges."
-
 msgid "2D World"
 msgstr ""
 
@@ -611,6 +696,11 @@ msgstr "Nachricht gelöscht"
 msgid "Password changed successfully."
 msgstr "Passwort erfolgreich geändert"
 
+#, fuzzy
+#| msgid "Password changed successfully."
+msgid "Passwort successfully reset!"
+msgstr "Passwort erfolgreich geändert"
+
 msgid "Bulletin Board Entry updated."
 msgstr "Bulletin Board Eintrag aktualisiert."
 
@@ -651,6 +741,21 @@ msgstr "Assembly-Events entdecken"
 msgid "%(room)s Currently Streaming"
 msgstr ""
 
+msgid "private"
+msgstr "Privat"
+
+msgid "public"
+msgstr "Öffentlich"
+
+msgid "friends"
+msgstr "Freunde"
+
+msgid "club"
+msgstr "Club (alle die den Badge ebenfalls besitzen)"
+
+msgid "friends and club"
+msgstr "Freunde und Club"
+
 msgid "Assembly Page"
 msgstr "Assembly Events"
 
@@ -668,10 +773,10 @@ msgid "Welcome to rC3"
 msgstr "Willkommen bei der rC3"
 
 msgid "What's Official?"
-msgstr ""
+msgstr "Was ist der Fahrplan?"
 
 msgid "official description"
-msgstr "Die beiden Streams \"rC1\" und \"rC2\" bilden das \"Hauptprogramm\" der rC3. Sie werden in der Tradition des Congress vom CCC-Content-Team betreut. Diese Inhalte sind traditionell frei über media.ccc.de verfügbar. Hier auf der Plattform findet Ihr sie natürlich ebenfalls."
+msgstr "Die virtuellen Bühnen 1 und 2 nenne sich passend \"rC1\" and \"rC2\", natürlich das \"rc3 Lounge\" nicht fehlen. Zusätzlich steuern 15 Community Bühnen ihr unabhängig kuratiertes Program zu den freien Streams der dezentralisierten Remote Chaos Experience bei."
 
 msgid "Explore Curated Events Button"
 msgstr "Hauptprogramm entdecken"
@@ -680,13 +785,13 @@ msgid "Congress Platform Title"
 msgstr "Plattform & 2D-Welt"
 
 msgid "platform description"
-msgstr "Ihr seid angekommen! Von hier geht es mitten rein in die remote Chaos Experience: Findet Eure favorisierten Vorträge und Workshops, erkundet die 2D-Welt oder trefft Euch mit Freunden im Videochat. Viel Spaß!"
+msgstr "Ihr seid angekommen! Von hier geht es mitten rein in die remote Chaos Experience: Findet Eure favorisierten Vorträge und Workshops, springt von den Assembly Seiten direkt in deren 2D Karten, erkundet die 2D-Welt oder trefft Euch mit Freunden im Videochat. Viel Spaß!"
 
 msgid "Community Title"
 msgstr "Community Content"
 
 msgid "community description"
-msgstr "Die Assemblies - das seid Ihr: All die verschiedenen Gruppen, die das Chaos bunt und entdeckenswert machen. Bei der rC3 gibt es über 20 Community-Bühnen, die Vorträge streamen. Dazu unzählige Assemblies, die Workshops und Diskussionsrunden anbieten und natürlich die beliebten Self-organised Sessions für all Eure spannenden Wissensgebiete."
+msgstr "Die Assemblies - das seid Ihr: All die verschiedenen Gruppen, die das Chaos bunt und entdeckenswert machen. Bei der rC3 gibt es weit über 300 Assemblies die Talks, Workshops, 2D Welten und Diskussionsrunden anbieten und natürlich die beliebten Self-organised Sessions für all Eure spannenden Wissensgebiete."
 
 msgid "Explore Community Events"
 msgstr "Community Content entdecken"
@@ -704,21 +809,21 @@ msgstr "Persönlicher Fahrplan"
 
 #, python-format
 msgid "%(conf)s - Password Reset complete"
-msgstr ""
+msgstr "%(conf)s - Passwort zurückgesetzt"
 
 #, python-format
 msgid "%(conf)s - Reset Password"
-msgstr ""
+msgstr "%(conf)s - Passwort zurücksetzten"
 
 #, python-format
 msgid "%(conf)s - Password Reset sent"
-msgstr ""
+msgstr "%(conf)s - Passwort reset gesendet."
 
 msgid "report this message"
 msgstr "diese Nachricht melden"
 
 msgid "Send Personal Message"
-msgstr ""
+msgstr "Persönliche Nachricht senden"
 
 #, python-format
 msgid "Message from %(user)s"
@@ -739,20 +844,21 @@ msgstr ""
 msgid "Conference %(conf)s - Redeem Token"
 msgstr "Veranstaltung %(conf)s - Token einlösen"
 
-msgid "Redeem Token"
-msgstr "Token einlösen"
+#, python-format
+msgid "Hello '%(user)s'"
+msgstr "Hallo '%(user)s'"
 
 #, python-format
 msgid "You are Logged in as '%(user)s', do you want to join the Conference with this User?"
-msgstr ""
+msgstr "Du bist als '%(user)s' eingeloggt. Möchtest Du mit diesem Benutzer der Konferenz beitreten?"
 
 #, python-format
 msgid "You're receiving this email because you requested a password reset for your user account at %(site_name)s."
-msgstr ""
+msgstr "Du bekommst diese Mail weil Du ein Passwort reset für Deinen Accoutn auf der Seite '%(site_name)s.' angefordert hast."
 
 #, python-format
 msgid "Your username, in case you’ve forgotten: %(username)s"
-msgstr ""
+msgstr "Falls vergessen, Dein Username: %(username)s"
 
 #, python-format
 msgid "The %(site_name)s team"
@@ -771,6 +877,11 @@ msgstr "Erstellen"
 msgid "Tag %(name)s"
 msgstr ""
 
+#, fuzzy, python-format
+#| msgid "Conference %(conf)s - Redeem Token"
+msgid "Conference %(conf)s - Password Reset"
+msgstr "Veranstaltung %(conf)s - Token einlösen"
+
 msgid "Upcoming events"
 msgstr "Kommende Veranstaltungen"
 
@@ -786,6 +897,12 @@ msgstr "Profil aktualisiert"
 msgid "Start 2D World"
 msgstr ""
 
+#~ msgid "Submit"
+#~ msgstr "Abschicken"
+
+#~ msgid "no Badges availaible"
+#~ msgstr "Keine Badges."
+
 #~ msgid "Curated Events Notes Title"
 #~ msgstr "Veranstaltungshinweise"
 
@@ -803,51 +920,3 @@ msgstr ""
 
 #~ msgid "Unknown Username or Password"
 #~ msgstr "Unbekannter Benutzername oder Passwort falsch"
-
-msgid "My Badges"
-msgstr "Meine Badges"
-
-msgid "Redeem Badge Token"
-msgstr "Redeem Badge Token"
-
-msgid "Manage Badges"
-msgstr "Badgeverwaltung"
-
-msgid "Accepted Badges"
-msgstr "Akzeptierte Badges"
-
-msgid "Pending Badges"
-msgstr "Ausstehende Badges"
-
-msgid "Revoke Badge"
-msgstr "Widerrufen"
-
-msgid "Accept Badge"
-msgstr "Akzeptieren"
-
-msgid "Badges: Accept / Revoke / Visibility"
-msgstr "Badges: Akzeptieren / Widerrufen / Sichtbarkeit"
-
-msgid "Visibility"
-msgstr "Sichtbarkeit"
-
-msgid "private"
-msgstr "Privat"
-
-msgid "public"
-msgstr "Öffentlich"
-
-msgid "friends"
-msgstr "Freunde"
-
-msgid "club"
-msgstr "Club (alle die den Badge ebenfalls besitzen)"
-
-msgid "friends and club"
-msgstr "Freunde und Club"
-
-msgid "No badges are waiting for approval."
-msgstr "Hier warten gerade keine Badges auf dich."
-
-msgid "Save visibility"
-msgstr "Sichtbarkeit speichern"
diff --git a/src/plainui/locale/en/LC_MESSAGES/django.po b/src/plainui/locale/en/LC_MESSAGES/django.po
index 4e6ac725f1c4f4356a42705bc31af0264f852e7f..398c56773becf3cfdbb597c840e8854e86e151bd 100644
--- a/src/plainui/locale/en/LC_MESSAGES/django.po
+++ b/src/plainui/locale/en/LC_MESSAGES/django.po
@@ -39,6 +39,24 @@ msgstr ""
 msgid "Your Username will be visible to other users"
 msgstr ""
 
+msgid "Username"
+msgstr ""
+
+msgid "Please enter the Username that used this Ticket and your new Password"
+msgstr ""
+
+msgid "Unknown User"
+msgstr ""
+
+msgid "User is not active!"
+msgstr ""
+
+msgid "User can use password reset by email!"
+msgstr ""
+
+msgid "User didn't use this Ticket!"
+msgstr ""
+
 msgid "blocked"
 msgstr ""
 
@@ -117,9 +135,20 @@ msgstr ""
 msgid "All Assemblies Events"
 msgstr ""
 
+msgid "Contacts"
+msgstr ""
+
 msgid "assembly rooms"
 msgstr ""
 
+#, fuzzy
+#| msgid "Assembly Events"
+msgid "assembly badges"
+msgstr "Assembly Events"
+
+msgid "No badges publicly available."
+msgstr ""
+
 msgid "Self-organized Sessions"
 msgstr ""
 
@@ -141,6 +170,9 @@ msgstr "About rC3"
 msgid "Disclaimer"
 msgstr "Imprint"
 
+msgid "Principles"
+msgstr ""
+
 msgid "Bulletin Board"
 msgstr ""
 
@@ -162,6 +194,21 @@ msgstr ""
 msgid "Public Bulletin Board"
 msgstr ""
 
+msgid "Fahrplan in new Tab"
+msgstr ""
+
+msgid "Revoke Badge"
+msgstr "Revoke Badge"
+
+msgid "Accept Badge"
+msgstr "Accept Badge"
+
+msgid "Visibility"
+msgstr "Visibility"
+
+msgid "Save visibility"
+msgstr "Save visibility"
+
 msgid "No entries available."
 msgstr ""
 
@@ -251,7 +298,7 @@ msgid "by"
 msgstr ""
 
 msgid "Mehr anzeigen"
-msgstr ""
+msgstr "show more"
 
 msgid "Edit"
 msgstr ""
@@ -379,6 +426,24 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
+msgid "Accepted Badges"
+msgstr "Accepted Badges"
+
+msgid "No badges Accepted."
+msgstr ""
+
+msgid "Redeem Badge Token"
+msgstr "Redeem Badge Token"
+
+msgid "Pending Badges"
+msgstr "Pending Badges"
+
+msgid "No badges are waiting for approval."
+msgstr "No badges are waiting for approval."
+
+msgid "Redeem Token"
+msgstr ""
+
 msgid "Change Password"
 msgstr ""
 
@@ -489,11 +554,19 @@ msgstr ""
 msgid "save"
 msgstr ""
 
-msgid "Badge-Token"
-msgstr ""
+msgid "My Badges"
+msgstr "My Badges"
 
-msgid "Submit"
-msgstr ""
+msgid "Manage Badges"
+msgstr "Manage Badges"
+
+#, fuzzy
+#| msgid "Pending Badges"
+msgid "Pending badges"
+msgstr "Pending Badges"
+
+msgid "Badges: Accept / Revoke / Visibility"
+msgstr "Manage Badges (Acceptance / Revoke / Visibility)"
 
 msgid "My Favorites"
 msgstr ""
@@ -507,6 +580,9 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
+msgid "Use Token for Password Reset"
+msgstr ""
+
 msgid "Submit Token"
 msgstr ""
 
@@ -525,6 +601,9 @@ msgstr ""
 msgid "Add your Ticket to this existing Account"
 msgstr ""
 
+msgid "User accounts from signup.c3assemblies.de and maschinenraum.rc3.world are imported and can be used to login."
+msgstr ""
+
 msgid "Please go to the following page and choose a new password:"
 msgstr ""
 
@@ -568,6 +647,9 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
+msgid "Password Reset"
+msgstr ""
+
 msgid "Upcoming"
 msgstr ""
 
@@ -591,9 +673,6 @@ msgstr ""
 msgid "badges"
 msgstr ""
 
-msgid "no Badges availaible"
-msgstr ""
-
 msgid "2D World"
 msgstr ""
 
@@ -621,6 +700,9 @@ msgstr ""
 msgid "Password changed successfully."
 msgstr ""
 
+msgid "Passwort successfully reset!"
+msgstr ""
+
 msgid "Bulletin Board Entry updated."
 msgstr ""
 
@@ -661,6 +743,21 @@ msgstr "Explore Assembly Events"
 msgid "%(room)s Currently Streaming"
 msgstr ""
 
+msgid "private"
+msgstr "Private"
+
+msgid "public"
+msgstr "Public"
+
+msgid "friends"
+msgstr "Friends"
+
+msgid "club"
+msgstr "Club (all who own this badge)"
+
+msgid "friends and club"
+msgstr "Friends and Club"
+
 msgid "Assembly Page"
 msgstr ""
 
@@ -678,13 +775,13 @@ msgid "Welcome to rC3"
 msgstr ""
 
 msgid "What's Official?"
-msgstr "What's official?"
+msgstr "What's the Fahrplan?"
 
 msgid "official description"
-msgstr "The two streams \"rC1\" and \"rC2\" form the \"main channels\" of rC3. In the tradition of the Congress, they are maintained by the CCC Content Team. This content is traditionally freely available via media.ccc.de. Of course, you will also find it here on the platform."
+msgstr "The virtual halls 1 and 2 are appropriately titled \"rC1\" and \"rC2\" and the music program of the \"rc3 Lounge\" may of course not be missing. In addition, 15 community streams contribute their independently curated program to the decentralized Remote Chaos Experience."
 
 msgid "Explore Curated Events Button"
-msgstr "Explore Curated Events"
+msgstr "Explore Fahrplan"
 
 msgid "Congress Platform Title"
 msgstr "This is the platform"
@@ -696,10 +793,10 @@ msgid "Community Title"
 msgstr "What are assemblies?"
 
 msgid "community description"
-msgstr "The assemblies - that's you: All the different groups that make Chaos colourful and worth exploring. At rC3 there are over 20 community stages streaming talks, plus countless assemblies offering workshops and discussion panels. And of course there are the popular self-organised sessions for all your exciting fields of interest."
+msgstr "The assemblies - that's you: All the different groups that make Chaos colourful and worth exploring. At rC3 there are over 300assemblies offering talks, workshops, 2D worlds and discussion panels. And of course there are the popular self-organised sessions for all your exciting fields of interest."
 
 msgid "Explore Community Events"
-msgstr ""
+msgstr "Explore Community"
 
 #, python-format
 msgid "%(conf)s - Login"
@@ -750,7 +847,8 @@ msgstr ""
 msgid "Conference %(conf)s - Redeem Token"
 msgstr ""
 
-msgid "Redeem Token"
+#, python-format
+msgid "Hello '%(user)s'"
 msgstr ""
 
 #, python-format
@@ -782,6 +880,10 @@ msgstr ""
 msgid "Tag %(name)s"
 msgstr ""
 
+#, python-format
+msgid "Conference %(conf)s - Password Reset"
+msgstr ""
+
 msgid "Upcoming events"
 msgstr ""
 
@@ -818,51 +920,3 @@ msgstr ""
 
 #~ msgid "messages_at"
 #~ msgstr "At"
-
-msgid "My Badges"
-msgstr "My Badges"
-
-msgid "Redeem Badge Token"
-msgstr "Redeem Badge Token"
-
-msgid "Manage Badges"
-msgstr "Manage Badges"
-
-msgid "Accepted Badges"
-msgstr "Accepted Badges"
-
-msgid "Pending Badges"
-msgstr "Pending Badges"
-
-msgid "Revoke Badge"
-msgstr "Revoke Badge"
-
-msgid "Accept Badge"
-msgstr "Accept Badge"
-
-msgid "Badges: Accept / Revoke / Visibility"
-msgstr "Badges: Accept / Revoke / Visibility"
-
-msgid "Visibility"
-msgstr "Visibility"
-
-msgid "private"
-msgstr "Private"
-
-msgid "public"
-msgstr "Public"
-
-msgid "friends"
-msgstr "Friends"
-
-msgid "club"
-msgstr "Club (all who own this badge)"
-
-msgid "friends and club"
-msgstr "Friends and Club"
-
-msgid "No badges are waiting for approval."
-msgstr "No badges are waiting for approval."
-
-msgid "Save visibility"
-msgstr "Save visibility"
\ No newline at end of file
diff --git a/src/plainui/views.py b/src/plainui/views.py
index a1f07b988251d4e2f1cfc4c4e764c48c88a6b87f..a426f9dd2113e1439d24ad8743e902b995f07bb0 100644
--- a/src/plainui/views.py
+++ b/src/plainui/views.py
@@ -285,6 +285,7 @@ class AssemblyView(ConferenceRequiredMixin, TemplateView):
         context['scope'] = 'assembly'
         context['can_create_sos'] = assembly.has_user(self.request.user) or assembly == self.conf.self_organized_sessions_assembly
         context['sos'] = assembly.events.filter(is_public=True, kind=Event.Kind.SELF_ORGANIZED)
+        context['badges'] = Badge.objects.filter(conference=self.conf, issuing_assembly=assembly, show_public=True)
 
         suggestions = assembly.suggestions.select_related('assembly2')
         suggestions = suggestions.exclude(assembly2=assembly.pk).filter(assembly2__state__in=Assembly.PUBLIC_STATES).order_by('-like_ratio')[:5]
@@ -1451,6 +1452,12 @@ class CccEventsView(ConferenceRequiredMixin, TemplateView):
 
         context['page'] = static_page
 
+        events = _event_filter(self.request.user, self.conf, public_fahrplan=True)
+        # events = _event_filter(self.request.user, self.conf)
+        context['events'] = _organize_events_for_calendar(self.conf, events)
+
+        return context
+
         return context