diff --git a/screenshots/home.png b/screenshots/home.png
index b5f0b0c..d54fad1 100644
Binary files a/screenshots/home.png and b/screenshots/home.png differ
diff --git a/templates/index.html b/templates/index.html
index 596268f..253b038 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -79,16 +79,13 @@
       <h1 class="mb-3 h2">Welcome to Pastey</h1>
       <p class="mb-3">A lightweight, self-hosted paste platform</p><br />
       <div class="row justify-content-md-center">
-        <div class="col-md-1">
-          <a class="btn btn-primary m-2" href="/new" role="button" rel="nofollow">New Paste</a>
+        <div class="col-md-2">
+          <a class="btn btn-primary text-nowrap m-2" href="/new" role="button" rel="nofollow">New Paste</a>
         </div>
 
         {% if show_cli_button %}
-        <div class="col-md-1">
-          <div style="margin-top:8px; font-weight:bold; font-size:18px;">or</div>
-        </div>
-        <div class="col-md-1">
-          <a class="btn btn-success m-2" href="{{ script_url }}" role="button"
+        <div class="col-md-2">
+          <a class="btn btn-success text-nowrap m-2" href="{{ script_url }}" role="button"
             data-mdb-toggle="tooltip"
             title="Pastey provides a script that can be used to pipe output directly from the command line">Use CLI</a>
         </div>
diff --git a/templates/view.html b/templates/view.html
index 7310ad4..944cbc1 100644
--- a/templates/view.html
+++ b/templates/view.html
@@ -94,7 +94,7 @@
               <input class="form-control pastey-input" id="paste-url" type="text" value="{{ url }}" readonly />
           </div>
           <div class="col-md-1">
-              <button type="button" class="btn btn-success" onclick="copyToClipboard()">Copy Link</button>
+              <button type="button" class="btn btn-success text-nowrap" onclick="copyToClipboard()">Copy Link</button>
           </div>
       </div>
       {% if paste.uses == 0 %}
@@ -114,7 +114,7 @@
           <form action="/paste" method="POST">
               <div class="row">
                   <div class="col-md-12 mb-4">
-                      <pre class="prettyprint linenums">{% if paste.language == 'Plaintext' %}<span class="nocode">{% endif %}{{ paste.content }}{% if paste.language == 'Plaintext' %}</span>{% endif %}</pre>          
+                      <pre class="prettyprint linenums">{{ paste.content }}</pre>          
                   </div>    
               </div>
           </form>