diff --git a/html/inc/forum.inc b/html/inc/forum.inc
index 2020ca9fe3..39705d8ef2 100644
--- a/html/inc/forum.inc
+++ b/html/inc/forum.inc
@@ -555,7 +555,7 @@ function show_post(
     } else {
         $highlight = $is_posted_by_special;
     }
-    $class = $highlight?' class="bg-info" ':'';
+    $class = $highlight?' style="border-left: 5px solid LightGreen" ':'';
 
     echo "
         <tr>
@@ -577,7 +577,7 @@ function show_post(
     
     $url = "pm.php?action=new&amp;userid=".$user->id;
     $name = $user->name;
-    show_button($url, tra("Send&nbsp;message"), tra("Send %1 a private message",$name));
+    show_button($url, tra("Send message"), tra("Send %1 a private message",$name));
     echo '<br>'.tra("Joined: %1", gmdate('j M y', $user->create_time)), "<br>";
 
     if (!isset($user->nposts)) {
diff --git a/html/inc/pm.inc b/html/inc/pm.inc
index 697c6f8cb7..1882ae41c4 100644
--- a/html/inc/pm.inc
+++ b/html/inc/pm.inc
@@ -60,7 +60,6 @@ function pm_team_form($user, $teamid, $error=null) {
     start_table();
     echo $bbcode_html;
     echo "<tr><td>\n";
-    echo "foobar";
     echo "<textarea name=\"content\" class=\"form-control\" rows=\"18\">$content</textarea>";
     echo "</td></tr>\n";
     end_table();
diff --git a/html/inc/text_transform.inc b/html/inc/text_transform.inc
index e63b3cb8eb..f321ff6bd6 100644
--- a/html/inc/text_transform.inc
+++ b/html/inc/text_transform.inc
@@ -144,7 +144,7 @@ function replace_pre_code($text, $export) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
-                return "<pre style=\"width:800px;overflow:scroll\">$x</pre>";
+                return "<pre style=\"white-space:pre-wrap; \">$x</pre>";
             },
             $text
         );
diff --git a/html/inc/util.inc b/html/inc/util.inc
index 252e8ad22d..20c8917839 100644
--- a/html/inc/util.inc
+++ b/html/inc/util.inc
@@ -800,7 +800,7 @@ function current_url() {
 // @param desc The title of the destination - typically used as a popup
 // @param class The optional CSS class of the button. Defaults to a standard button
 //
-function show_button($url, $text, $desc=null, $class="btn btn-default btn-xs") {
+function show_button($url, $text, $desc=null, $class="btn btn-default btn-sm") {
     if (!$desc) $desc = $text;
     echo "<a href=\"".$url."\" title=\"$desc\" class=\"".$class."\">".$text."</a>\n";
 }