diff --git a/static/styles/portico.css b/static/styles/portico.css
index 19dccbc7d6..a5c3d13f11 100644
--- a/static/styles/portico.css
+++ b/static/styles/portico.css
@@ -921,9 +921,10 @@ a.bottom-signup-button {
     font-weight: 400;
 }
 
-.authors_row {
-    width: 100%;
-    table-layout: fixed;
+.contributors {
+    display: grid;
+    grid-gap: 5px;
+    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
 }
 
 .contributors .person a {
@@ -931,15 +932,9 @@ a.bottom-signup-button {
 }
 
 .contributors .person {
-    width: calc(33% - 20px - 2px);
-    display: inline-block;
-    vertical-align: top;
-
+    box-sizing: border-box;
     padding: 10px;
-    margin: 5px 0px;
-
     border: 1px solid #eee;
-
     border-radius: 4px;
     transition: all 0.3s ease;
 }
@@ -948,13 +943,8 @@ a.bottom-signup-button {
     border: 1px solid #bbb;
 }
 
-.contributors .person td:hover {
-    color: hsl(173, 100%, 24%);
-    box-shadow: 0px 0px 30px hsl(175, 41%, 78%);
-}
-
 .contributors .person .avatar {
-    width: 55px;
+    width: 60px;
     text-align: center;
     display: inline-block;
     vertical-align: top;
@@ -968,12 +958,6 @@ a.bottom-signup-button {
     margin-left: 10px;
 }
 
-.contributors .last-updated {
-    color: #aaa;
-    font-size: 0.8em;
-    text-align: center;
-}
-
 .avatar_img {
     width: auto;
     height: auto;
@@ -982,6 +966,12 @@ a.bottom-signup-button {
     border-radius: 20%;
 }
 
+.last-updated {
+    color: #aaa;
+    font-size: 0.8em;
+    text-align: center;
+}
+
 .integration-instruction-block .integration-lozenge {
     float: left;
     margin-top: 5px;
@@ -1744,10 +1734,6 @@ input.new-organization-button {
     .app.help .sidebar.show ~ .markdown {
         -webkit-filter: brightness(0.7);
     }
-
-    .contributors .person {
-        width: calc(50% - 20px - 4px);
-    }
 }
 
 @media (max-width: 950px) {
diff --git a/templates/zerver/team.html b/templates/zerver/team.html
index cfc89c577d..fb5bc6312c 100644
--- a/templates/zerver/team.html
+++ b/templates/zerver/team.html
@@ -100,23 +100,24 @@
                 </div>
             </div>
 
-            <div class="contributors">
-                <h1>Our amazing community</h1>
-                <p>
-                    While the team at Kandra Labs provides important
-                    leadership, Zulip is built by an incredible
-                    distributed community of developers from all
-                    around the world.  You can read about
-                    the <a href="/history">project's history</a> if
-                    you want to learn more about Zulip's origins.
-                </p>
-                <p>
-                    Here, we recognize the top contributors to the
-                    Zulip server project on GitHub!  Zulip's community
-                    in unusual in how many people outside the core
-                    team have made major contributions to the project.
-                </p>
+            <!-- Contributors -->
+            <h1>Our amazing community</h1>
+            <p>
+                While the team at Kandra Labs provides important
+                leadership, Zulip is built by an incredible
+                distributed community of developers from all
+                around the world.  You can read about
+                the <a href="/history">project's history</a> if
+                you want to learn more about Zulip's origins.
+            </p>
+            <p>
+                Here, we recognize the top contributors to the
+                Zulip server project on GitHub!  Zulip's community
+                in unusual in how many people outside the core
+                team have made major contributions to the project.
+            </p>
 
+            <div class="contributors">
                 {% for person in data %}
                 <div class="person">
                     <a href="https://github.com/{{ person.name }}" target="_blank" class="no-underline">
@@ -130,11 +131,11 @@
                     </a>
                 </div>
                 {% endfor %}
-
-                <p class="last-updated">
-                    Statistic last updated: {{ date }}
-                </p>
             </div>
+
+            <p class="last-updated">
+                Statistic last updated: {{ date }}
+            </p>
         </div>
     </div>
 </div>