diff --git a/js/package.json b/js/package.json
index a44f4d251..a496eeb72 100644
--- a/js/package.json
+++ b/js/package.json
@@ -95,5 +95,9 @@
     "vue-i18n-extract": "^1.0.2",
     "vue-template-compiler": "^2.6.11",
     "webpack-cli": "^3.3.11"
+  },
+  "resolutions": {
+    "prosemirror-model": "1.9.1",
+    "prosemirror-state": "1.3.3"
   }
 }
diff --git a/js/public/index.html b/js/public/index.html
index 37c6a0767..7a8eae898 100644
--- a/js/public/index.html
+++ b/js/public/index.html
@@ -1,23 +1,24 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-    <title><%= htmlWebpackPlugin.options.title %></title>
-    <!-- <%= VUE_APP_INJECT_COMMENT %> -->
-    <meta name="server-injected-data" />
-  </head>
-  <body>
-    <noscript>
-      <strong
-        >We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
-        properly without JavaScript enabled. Please enable it to
-        continue.</strong
-      >
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>
+
+<head>
+  <meta charset="utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+  <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+  <!-- <title><%= htmlWebpackPlugin.options.title %></title> -->
+  <!-- <%= VUE_APP_INJECT_COMMENT %> -->
+  <meta name="server-injected-data" />
+</head>
+
+<body>
+  <noscript>
+    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
+      properly without JavaScript enabled. Please enable it to
+      continue.</strong>
+  </noscript>
+  <div id="app"></div>
+  <!-- built files will be auto injected -->
+</body>
+
+</html>
\ No newline at end of file
diff --git a/js/src/components/Event/EventListCard.vue b/js/src/components/Event/EventListCard.vue
index dd7e916d0..a8095dd80 100644
--- a/js/src/components/Event/EventListCard.vue
+++ b/js/src/components/Event/EventListCard.vue
@@ -98,7 +98,7 @@
               >{{ $t("Edit") }}</b-button
             >
           </li>
-          <li>
+          <li v-if="participation.role === ParticipantRole.CREATOR">
             <b-button
               type="is-text"
               @click="
diff --git a/js/src/components/SearchField.vue b/js/src/components/SearchField.vue
index 8124f47ee..3c2ba9d59 100644
--- a/js/src/components/SearchField.vue
+++ b/js/src/components/SearchField.vue
@@ -1,8 +1,9 @@
 <template>
-  <label>
+  <label for="navSearchField">
     <span class="visually-hidden">{{ defaultPlaceHolder }}</span>
     <b-input
       custom-class="searchField"
+      id="navSearchField"
       icon="magnify"
       type="search"
       rounded
diff --git a/js/src/views/About.vue b/js/src/views/About.vue
index 441e0e0eb..aa0b19820 100644
--- a/js/src/views/About.vue
+++ b/js/src/views/About.vue
@@ -24,7 +24,7 @@
         </div>
       </div>
     </div>
-    <div class="container" id="mobilizon">
+    <div class="container">
       <section>
         <div class="columns">
           <div class="column has-text-left-desktop">
@@ -46,7 +46,11 @@
             />
           </div>
           <div class="column has-text-right-desktop has-text-centered-mobile">
-            <img src="img/about/action-mobilizon.png" width="300" alt="" />
+            <img
+              src="img/about/action-mobilizon.png"
+              width="300"
+              :alt="$t('Organize and take action, freely')"
+            />
           </div>
         </div>
       </section>
@@ -81,7 +85,11 @@
             </p>
           </div>
           <div class="column has-text-left-desktop has-text-centered-mobile">
-            <img src="img/about/common-mobilizon.png" width="300" alt="" />
+            <img
+              src="img/about/common-mobilizon.png"
+              width="300"
+              :alt="$t('Let\'s create a new common')"
+            />
           </div>
         </div>
       </section>
@@ -140,7 +148,11 @@
             </i18n>
           </div>
           <div class="column has-text-right-desktop has-text-centered-mobile">
-            <img src="img/about/software-to-the-people-mobilizon.png" width="300" alt="" />
+            <img
+              src="img/about/software-to-the-people-mobilizon.png"
+              width="300"
+              :alt="('Software to the people')"
+            />
           </div>
         </div>
       </section>
@@ -162,7 +174,11 @@
             </i18n>
           </div>
           <div class="column has-text-left-desktop has-text-centered-mobile">
-            <img src="img/about/concieved-mobilizon.png" width="300" alt="" />
+            <img
+              src="img/about/concieved-mobilizon.png"
+              width="300"
+              :alt="$t('Concieved with care for humans')"
+            />
           </div>
         </div>
       </section>
@@ -216,6 +232,12 @@ export default class About extends Vue {
 <style lang="scss" scoped>
 @import "../variables.scss";
 
+a:not(.button) {
+  padding: 0.3rem;
+  background: #ffd599;
+  color: #111;
+}
+
 .hero.is-primary .subtitle {
   padding: 1rem;
   display: block;
@@ -267,6 +289,7 @@ section {
 
   .blockquote-footer a {
     color: #6c757d;
+    background: initial;
 
     &:before {
       content: "\2014\00A0";
diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue
index 9528e7d7d..d92ef4c07 100644
--- a/js/src/views/Home.vue
+++ b/js/src/views/Home.vue
@@ -30,6 +30,22 @@
         </div>
       </div>
     </section>
+    <div class="container section" v-if="config && (!currentUser.id || !currentActor.id)">
+      <section class="events-featured">
+        <h3 class="title">{{ $t("Featured events") }}</h3>
+        <b-loading :active.sync="$apollo.loading" />
+        <div v-if="filteredFeaturedEvents.length > 0" class="columns is-multiline">
+          <div
+            class="column is-one-third-desktop"
+            v-for="event in filteredFeaturedEvents.slice(0, 6)"
+            :key="event.uuid"
+          >
+            <EventCard :event="event" />
+          </div>
+        </div>
+        <b-message v-else type="is-danger">{{ $t("No events found") }}</b-message>
+      </section>
+    </div>
     <div class="container section" v-if="config && loggedUser && loggedUser.settings">
       <section v-if="currentActor.id">
         <b-message type="is-info" v-if="welcomeBack">{{
@@ -299,7 +315,11 @@ export default class Home extends Vue {
    */
   get filteredFeaturedEvents() {
     return this.events.filter(
-      ({ id }) => !this.currentUserParticipations.map(({ event: { id } }) => id).includes(id)
+      ({ id }) =>
+        !this.currentUserParticipations
+          .filter((participation) => participation.role === ParticipantRole.CREATOR)
+          .map(({ event: { id } }) => id)
+          .includes(id)
     );
   }
 
diff --git a/js/yarn.lock b/js/yarn.lock
index 06e6ceb1c..2f094624e 100644
--- a/js/yarn.lock
+++ b/js/yarn.lock
@@ -10963,20 +10963,13 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2:
     prosemirror-state "^1.0.0"
     w3c-keyname "^2.2.0"
 
-prosemirror-model@1.9.1:
+prosemirror-model@1.9.1, prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.8.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.9.1.tgz#8c08cf556f593c5f015548d2c1a6825661df087f"
   integrity sha512-Qblh8pm1c7Ll64sYLauwwzjimo/tFg1zW3Q3IWhKRhvfOEgRKqa6dC5pRrAa+XHOIjBFEYrqbi52J5bqA2dV8Q==
   dependencies:
     orderedmap "^1.1.0"
 
-prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.8.1:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.10.0.tgz#bb1101732bccacf336e23a36a8b045b865025fa2"
-  integrity sha512-xTMbbO2q4abs5lJdeRvk/SrftNfZlMdvChKziTiK+OKtP8LkQI8uw39u4S5zqyflrmW3Or6+qnyFPf1p4v2u1g==
-  dependencies:
-    orderedmap "^1.1.0"
-
 prosemirror-schema-list@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.2.tgz#310809209094b03425da7f5c337105074913da6c"
