diff --git a/templates/jaasai/index.html b/templates/jaasai/index.html
index b565360a..61d8880c 100644
--- a/templates/jaasai/index.html
+++ b/templates/jaasai/index.html
@@ -156,47 +156,32 @@ <h2>Trusted by 10,000+ engineers at</h2>
     </div>
   </section>
   <section class="p-section">
-    <div class="u-fixed-width">
-      <hr class="p-rule">
-    </div>
+    <hr class="p-rule is-fixed-width">
     <div class="row">
-      <div class="col-6">
-        <h2>What is JAAS?</h2>
+      <div class="col-6 col-medium-3">
+        <h2 class="p-section--shallow">What is JAAS?</h2>
       </div>
-      <div class="col-6">
+      <div class="col-6 col-medium-3">
         <p>JAAS has two main components:</p>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-9 col-start-large-4">
-        <div class="u-fixed-width">
-          <hr class="p-rule">
-        </div>
         <div class="row">
-          <div class="col-3">
-            <h5>JIMM<h5>
+          <div class="col-2">
+            <h5>JIMM</h5>
           </div>
-          <div class="col-6">
+          <div class="col-4">
             <p>the Juju Infinite Model Manager is a single point of contact for multiple Juju controllers</p>
           </div>
         </div>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-9 col-start-large-4">
-        <div class="u-fixed-width">
-          <hr class="p-rule">
-        </div>
+        <hr class="p-rule is-muted">
         <div class="row">
-          <div class="col-3">
-            <h5>Dashboard<h5>
+          <div class="col-2">
+            <h5>Dashboard</h5>
           </div>
-          <div class="col-6">
+          <div class="col-4">
             <p>a graphical user interface to simplify common administrative operations</p>
           </div>
         </div>
         <div class="row">
-          <div class="col-9">
+          <div class="u-fixed-width">
             {{ image(
                 url="https://assets.ubuntu.com/v1/cae5250f-Jaas.png",
                 alt="",