diff --git a/viewer/static_src/css/crawler.less b/viewer/static_src/css/crawler.less
index c7339bb..d612c87 100644
--- a/viewer/static_src/css/crawler.less
+++ b/viewer/static_src/css/crawler.less
@@ -1,4 +1,4 @@
-.o-radio_buttons {
+.search-options {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
@@ -20,15 +20,15 @@
   }
 }
 
-.results_list {
+.results-list {
   li {
     list-style-type: none;
   }
 
-  .results_item {
+  .results-list__item {
     padding: 24px 0 !important;
 
-    + .results_item {
+    + .results-list__item {
       border-top: 1px solid var(--gray-40);
     }
   }
diff --git a/viewer/templates/viewer/page_list.html b/viewer/templates/viewer/page_list.html
index 729acbf..8d8da84 100644
--- a/viewer/templates/viewer/page_list.html
+++ b/viewer/templates/viewer/page_list.html
@@ -37,10 +37,10 @@
 </div>
 
 <div class="block block--sub block--flush-top">
-  <div class="results_list">
+  <div class="results-list">
     <ul class="m-list">
       {% for page in results %}
-      <li class="results_item">
+      <li class="results-list__item">
         <h4>
           <a class="a-link a-link--icon u-nowrap" href="{{ page.url }}">
             <span class="a-link__text u-truncate">{{ page.title }}</span>
diff --git a/viewer/templates/viewer/search_form.html b/viewer/templates/viewer/search_form.html
index ff751cd..1265a49 100644
--- a/viewer/templates/viewer/search_form.html
+++ b/viewer/templates/viewer/search_form.html
@@ -1,5 +1,5 @@
-<form action="{% url 'index' %}">
-  <div class="o-well">
+<div class="o-well">
+  <form class="o-form" action="{% url 'index' %}">
     <h2 class="h3">Search the index</h2>
     <div class="o-search-input">
       <div class="o-search-input__input">
@@ -38,7 +38,7 @@ <h2 class="h3">Search the index</h2>
       examples
     </p>
 
-    <div class="o-radio_buttons">
+    <div class="o-form__group search-options">
       <div class="m-form-field m-form-field--radio">
         <!-- prettier-ignore -->
         <input
@@ -138,5 +138,5 @@ <h2 class="h3">Search the index</h2>
     >
       Search
     </button>
-  </div>
-</form>
+  </form>
+</div>