diff --git a/client/scss/components/_form.scss b/client/scss/components/_form.scss
index 54b277d..01f25e1 100644
--- a/client/scss/components/_form.scss
+++ b/client/scss/components/_form.scss
@@ -9,6 +9,8 @@
 .snippet-form {
   background-color: $bgColor;
 
+  label { display: none; }
+
   select {
     -moz-appearance: none;
     -webkit-appearance: none;
@@ -52,8 +54,6 @@
     align-items: center;
     border-bottom: 1px solid $borderColor;
 
-    label { display: none; }
-
     .action {
       margin-left: auto;
 
@@ -67,8 +67,6 @@
   .content {
     padding: 20px $boxPadding;
 
-    label { display: none; }
-
     textarea {
       padding: 20px;
       @include codeTextArea;
diff --git a/client/scss/dpaste.scss b/client/scss/dpaste.scss
index e296aa9..b034a7e 100755
--- a/client/scss/dpaste.scss
+++ b/client/scss/dpaste.scss
@@ -55,9 +55,9 @@ $burgerBtnBorderColor: #575757;
 /* -----------------------------------------------------------------------------
       Fonts
 ----------------------------------------------------------------------------- */
-$baseFont: "Avenir Next";
+$baseFont: "Avenir Next", "Helvetica Neue", Helvetica, Arial;
 $codeFont: "SF Mono", "Fira Mono", Monaco, Menlo, Consolas, monospace;
-$textFont: "Apple SD Gothic Neo";
+$textFont: "Apple SD Gothic Neo", "Helvetica Neue", Helvetica, Arial;
 
 $baseFontLight: 300;
 $baseFontRegular: 400;
diff --git a/dpaste/highlight.py b/dpaste/highlight.py
index f0d247d..be5054a 100644
--- a/dpaste/highlight.py
+++ b/dpaste/highlight.py
@@ -129,7 +129,7 @@ LEXER_DEFAULT = getattr(settings, 'DPASTE_LEXER_DEFAULT', 'python')
 
 # Lexers which have wordwrap enabled by default
 LEXER_WORDWRAP = getattr(settings, 'DPASTE_LEXER_WORDWRAP', 
-    ('_text', 'rst')
+    ('rst')
 )
 
 
diff --git a/dpaste/templates/dpaste/details.html b/dpaste/templates/dpaste/details.html
index 819653a..458b9b1 100644
--- a/dpaste/templates/dpaste/details.html
+++ b/dpaste/templates/dpaste/details.html
@@ -69,7 +69,7 @@
     </p>
   {% endif %}
 
-  {% if snippet.lexer == 'text' %}
+  {% if snippet.lexer == '_text' %}
     <div class="snippet-text">{% include "dpaste/highlight/text.html" %}</div>
   {% else %}
     <div class="snippet-code">{% include "dpaste/highlight/code.html" %}</div>
diff --git a/dpaste/templates/dpaste/history.html b/dpaste/templates/dpaste/history.html
index f6e46ae..6b85beb 100644
--- a/dpaste/templates/dpaste/history.html
+++ b/dpaste/templates/dpaste/history.html
@@ -33,7 +33,7 @@
         {% blocktrans with snippet.published|timesince as since %}{{ since }} ago{% endblocktrans %}
       </h3>
 
-      {% if snippet.lexer == 'text' %}
+      {% if snippet.lexer == '_text' %}
         <div class="snippet-text">{% include "dpaste/highlight/text.html" %}</div>
       {% else %}
         <div class="snippet-code">{% include "dpaste/highlight/code.html" %}</div>
diff --git a/dpaste/templates/dpaste/includes/form.html b/dpaste/templates/dpaste/includes/form.html
index ecf7522..d0aa4eb 100644
--- a/dpaste/templates/dpaste/includes/form.html
+++ b/dpaste/templates/dpaste/includes/form.html
@@ -5,7 +5,7 @@
   {{ form.non_field_errors }}
 
 
-  <fieldset class="options">
+  <div class="options">
     <p style="display: none;">{{ form.title }}</p> {# Honeypot field #}
 
     <p class="options-lexer">
@@ -26,7 +26,7 @@
         <span class="platform-win">{% trans "Ctrl+&#9166;" %}</span>
             </button>
     </p>
-  </fieldset>
+  </div>
   
   <p class="content superenter {% if not object %}autofocus{% endif %} {% if form.content.errors %}error{% endif %}">
       <label for="{{ form.content.auto_id }}">{% trans "Content" %}</label>