diff --git a/public/htc_vive.html b/public/htc_vive.html
index bd46f16c..37954b51 100644
--- a/public/htc_vive.html
+++ b/public/htc_vive.html
@@ -29,7 +29,11 @@
     <dd></dd>
     -->
     <dt id="when_is_support_landing_in_release_channel_browsers"><a href="#when_is_support_landing_in_release_channel_browsers">When is WebVR support for the {{ headset.name }} landing in release-channel browsers?</a></dt>
-    <dd>WebVR support for the {{ headset.name }} is estimated to ship in mid-2017 in the stable, release-channel versions of both <a href="{{ browsers.firefox.about }}">{{ browsers.firefox.name }}</a> and <a href="{{ browsers.chrome.about }}">{{ browsers.chrome.name }}</a>.</dd>
+    <dd>
+      <p>
+        WebVR support for the {{ headset.name }} is estimated to ship in mid-2017 in the stable, release-channel versions of both <a href="{{ browsers.firefox.about }}">{{ browsers.firefox.name }}</a> and <a href="{{ browsers.chrome.about }}">{{ browsers.chrome.name }}</a>.
+      </p>
+    </dd>
     <dt id="can_i_still_use_a_vive_pre_developer_kit"><a href="#can_i_still_use_a_vive_pre_developer_kit">Can I still use a VIVE Pre developer kit?</a></dt>
     <dd>
       <p>
diff --git a/public/media/css/main.css b/public/media/css/main.css
index d60dd3f9..468f3976 100644
--- a/public/media/css/main.css
+++ b/public/media/css/main.css
@@ -186,6 +186,22 @@ figure {
   figure img + figcaption:not(:only-child) {
     margin-right: 0;
   }
+
+  .pt0-ns {
+    padding-top: 0 !important;
+  }
+
+  .pb0-ns {
+    padding-bottom: 0 !important;
+  }
+
+  .mt0-ns {
+    margin-top: 0 !important;
+  }
+
+  .mb0-ns {
+    margin-bottom: 0 !important;
+  }
 }
 
 @media screen and (min-width: 481px) {
@@ -386,7 +402,8 @@ html[data-layout~="headset"][data-layout~="htc_vive"] h3 a {
 }
 
 html[data-layout~="headset"][data-layout~="samsung_gear_vr"] [data-section]:not(:last-child),
-.header {
+.header,
+[data-section]:not(:last-child) {
   border-bottom-color: rgba(0,0,0,.1);
 }
 
@@ -404,11 +421,6 @@ html[data-layout~="headset"][data-layout~="samsung_gear_vr"] h3 a {
   color: #777;
 }
 
-html[data-layout~="headset"][data-layout~="samsung_gear_vr"] [data-section]:not(:last-child),
-.header {
-  border-bottom-color: rgba(0,0,0,.1);
-}
-
 a[itemprop="pictogram"] svg {
   width: 80px;
 }
@@ -539,6 +551,11 @@ p.message {
   padding-top: 2rem;
 }
 
+.main [data-section~="info"] dt,
+.main [data-section~="help"] dt {
+  padding-bottom: .25rem;
+}
+
 .main [data-section~="help"] dt a {
   color: #333;
 }
@@ -1488,11 +1505,17 @@ html[data-layout~="headset"][data-layout~="htc_vive"] .edit-page a:hover {
 [data-layout~="secondary"] [data-section~="help"] figure {
   background: #fafafa;
   margin-right: 1.5rem;
+  margin-top: 1.5rem;
 }
 
-[data-layout~="secondary"] [data-section~="setup"] figure + figure,
-[data-layout~="secondary"] [data-section~="help"] figure + figure {
-  margin-top: 1.5em;
+[data-layout~="secondary"] [data-section~="setup"] figure:last-child,
+[data-layout~="secondary"] [data-section~="help"] figure:last-child {
+  margin-top: 1rem;
+}
+
+[data-layout~="secondary"] [data-section~="setup"] li figure:last-child,
+[data-layout~="secondary"] [data-section~="help"] li figure:last-child {
+  margin-top: .75rem;
 }
 
 [data-layout~="secondary"] [data-section~="setup"] figure strong:first-child,
@@ -1802,7 +1825,7 @@ img.cover {
   }
 
   [data-layout~="secondary"] .main .section:last-child {
-    padding-bottom: 1.5rem;
+    padding-bottom: 0;
   }
 
   .site-header {
@@ -1917,9 +1940,20 @@ img.cover {
 }
 
 @media all and (min-width: 52.8rem) {
-  [data-layout~="secondary"] [data-section~="setup"] figure:first-child + figure,
-  [data-layout~="secondary"] [data-section~="help"] figure:first-child + figure {
-    margin-top: 0;
+  .pt0-l {
+    padding-top: 0 !important;
+  }
+
+  .pb0-l {
+    padding-bottom: 0 !important;
+  }
+
+  .mt0-l {
+    margin-top: 0 !important;
+  }
+
+  .mb0-l {
+    margin-bottom: 0 !important;
   }
 }
 
diff --git a/public/microsoft_edge.html b/public/microsoft_edge.html
index cf4f1d81..da3fcab1 100644
--- a/public/microsoft_edge.html
+++ b/public/microsoft_edge.html
@@ -27,3 +27,6 @@
 
 {% block reports_block %}
 {% endblock %}
+
+{% block help_block %}
+{% endblock %}
diff --git a/public/samsung_gear_vr.html b/public/samsung_gear_vr.html
index 0e4db72e..4423c296 100644
--- a/public/samsung_gear_vr.html
+++ b/public/samsung_gear_vr.html
@@ -148,7 +148,9 @@
 
     <dt id="controller_position_is_misplaced"><a href="#controller_position_is_misplaced">My controller position is misplaced in VR. How do I fix this?</a></dt>
     <dd>
-      <p>While in VR, hold your head still, and then press-and-hold down the Home button for several seconds.</p>
+      <p class="mb0">
+        While in VR, hold your head still, and then press-and-hold down the Home button for several seconds.
+      </p>
       <figure class="media-outlined figure-stretched">
         <img src="samsung_gear_vr/gear_vr_controller_home_button.png" width="180" height="180" alt="Home button on Gear VR controller">
         <figcaption><strong>Home button</strong> Press and hold down the Home button.</figcaption>
diff --git a/public/samsung_gear_vr.json b/public/samsung_gear_vr.json
index bf63cbb2..1165119f 100644
--- a/public/samsung_gear_vr.json
+++ b/public/samsung_gear_vr.json
@@ -4,8 +4,8 @@
   "name": "Samsung Gear VR",
   "alternateName": "Gear VR",
   "slug": "samsung_gear_vr",
-  "description": "Android-compatible <a href=\"https://www.samsung.com/global/galaxy/gear-vr/\" rel=\"noreferrer noopener\">headset</a>, with positional tracking and 3DoF controller support",
-  "description_html": "Android-compatible <a href=\"https://www.samsung.com/global/galaxy/gear-vr/\" rel=\"noreferrer noopener\">headset</a>, with positional tracking and <a href=\"https://www.samsung.com/global/galaxy/gear-vr/#controller\" rel=\"noreferrer noopener\">3DoF controller support</a>",
+  "description": "Android-compatible <a href=\"https://www.samsung.com/global/galaxy/gear-vr/\" rel=\"noreferrer noopener\">headset</a> with a 3DoF motion controller",
+  "description_html": "Android-compatible <a href=\"https://www.samsung.com/global/galaxy/gear-vr/\" rel=\"noreferrer noopener\">headset</a> with <a href=\"https://www.samsung.com/global/galaxy/gear-vr/#controller\" rel=\"noreferrer noopener\">3DoF motion controller</a>",
   "operatingSystem": "Windows 7.1+",
   "processorRequirements": "IA64",
   "logo": "/samsung_gear_vr/logo.png",
@@ -77,8 +77,7 @@
     "linux": [],
     "android": [
       "oculus_browser",
-      "samsung_internet",
-      "chrome_for_android"
+      "samsung_internet"
     ],
     "ios": []
   },
diff --git a/public/samsung_internet.json b/public/samsung_internet.json
index 459a9618..2e1c7c79 100644
--- a/public/samsung_internet.json
+++ b/public/samsung_internet.json
@@ -7,7 +7,6 @@
   "slug": "samsung_internet",
   "operatingSystem": "Android 5.1+",
   "headsets": [
-    "google_cardboard",
     "samsung_gear_vr"
   ],
   "showProcessorRequirements": false,