diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss
index 0a643f0a0a2..9a9eb264220 100644
--- a/public/sass/_variables.scss
+++ b/public/sass/_variables.scss
@@ -91,7 +91,7 @@ $form-sizes: (
 // Typography
 // -------------------------
 
-$font-family-sans-serif:    "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+$font-family-sans-serif:    "Helvetica Neue", Helvetica, Arial, sans-serif;
 $font-family-serif:         Georgia, "Times New Roman", Times, serif;
 $font-family-monospace:     Menlo, Monaco, Consolas, "Courier New", monospace;
 $font-family-base:        $font-family-sans-serif !default;
@@ -127,7 +127,7 @@ $lead-font-size:   1.25rem !default;
 $lead-font-weight: 300 !default;
 
 $headings-margin-bottom: ($spacer / 2) !default;
-$headings-font-family:   inherit !default;
+$headings-font-family:   "Open Sans" !default;
 $headings-font-weight:   400 !default;
 $headings-line-height:   1.1 !default;
 
diff --git a/public/sass/components/_navs.scss b/public/sass/components/_navs.scss
index 0d904d4d8a8..3f381922697 100644
--- a/public/sass/components/_navs.scss
+++ b/public/sass/components/_navs.scss
@@ -56,6 +56,7 @@
 
 // Actual tabs (as links)
 .nav-tabs > li > a {
+  color: $text-color;
   padding-top: 8px;
   padding-bottom: 8px;
   line-height: $line-height-base;
@@ -64,8 +65,10 @@
   &:hover,
   &:focus {
     border-color: $divider-border-color;
+    color: $link-color;
   }
 }
+
 // Active state, and it's :hover/:focus to override normal :hover/:focus
 .nav-tabs > .active > a,
 .nav-tabs > .active > a:hover,
@@ -85,3 +88,27 @@
 .tab-content > .active {
   display: block;
 }
+
+// temp hack
+.modal-body, .gf-box {
+  .nav-tabs {
+    border-bottom: none;
+  }
+
+  .nav-tabs > li > a {
+    border: none;
+    border-radius: 0;
+    &:hover,
+    &:focus {
+      border-bottom: 1px solid $blue;
+    }
+  }
+
+  .nav-tabs > .active > a,
+  .nav-tabs > .active > a:hover,
+  .nav-tabs > .active > a:focus {
+    border: none;
+    border-bottom: 1px solid $blue;
+    color: $link-color;
+  }
+}