diff --git a/doc/white.css b/doc/white.css
index 9666d23b6d..abc007903f 100644
--- a/doc/white.css
+++ b/doc/white.css
@@ -10,9 +10,15 @@ pre, code {
     font-size: medium;
 }
 
-.emphasize {
-	font-weight: bold;
+.lead {
+    font-size: 17px;
+    font-weight: bold;
 }
+
+.emphasize {
+    font-weight: bold;
+}
+
 .emphasize2 {
 	color: red;
 }
diff --git a/html/inc/forum.inc b/html/inc/forum.inc
index 938691d3c4..61d515686b 100644
--- a/html/inc/forum.inc
+++ b/html/inc/forum.inc
@@ -129,7 +129,7 @@ function show_forum_header($user) {
         <input type=\"hidden\" name=\"search_forum\" value=\"-1\">
         <input type=\"hidden\" name=\"search_sort\" value=\"5\">
         <input type=\"text\" name=\"search_keywords\">
-        <input class=\"btn btn-default\" title=\"".tra("Search for words in forum messages")."\" type=\"submit\" value=\"".tra("Search forums")."\"><br>
+        <input class=\"btn btn-primary\" title=\"".tra("Search for words in forum messages")."\" type=\"submit\" value=\"".tra("Search forums")."\"><br>
         <small><a href=\"forum_search.php\">".tra("Advanced search")."</a></small>
         </td>
     ";
@@ -558,9 +558,9 @@ function show_post(
     $class = $highlight?' class="bg-info" ':'';
 
     echo "
-        <tr>
-        <td $class rowspan=\"3\" width=\"20%\">
         <a name=\"$post->id\"></a>
+        <tr>
+        <td $class rowspan=\"3\" class=\"col-sm-2\">
     ";
 
     echo user_links($user, 0);
diff --git a/html/inc/profile.inc b/html/inc/profile.inc
index efdca7f0db..69a7660ac4 100644
--- a/html/inc/profile.inc
+++ b/html/inc/profile.inc
@@ -217,7 +217,10 @@ function show_profile($user, $logged_in_user, $screen_mode = false) {
     $can_edit = $logged_in_user && $user->id == $logged_in_user->id;
 
     if ($can_edit) {
-        row1("<a href=\"create_profile.php\">".tra("Edit your profile")."</a>", 1, false);
+        echo "<tr><td>";
+        show_button("create_profile.php", tra("Edit your profile"));
+        echo "</td></tr>
+        ";
     }
 
     // If screening is enabled, only show picture in certain situations
diff --git a/html/inc/text_transform.inc b/html/inc/text_transform.inc
index 64e7d943e6..8bda6d3954 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>$x</pre>";
+                return "<pre style=\"width:800px;overflow:scroll\">$x</pre>";
             },
             $text
         );
@@ -243,7 +243,8 @@ function bb2html($text, $export=false) {
             "<blockquote>\\1</blockquote>",
             "<ul>\\1</ul><p>",
             "<ol>\\1</ol><p>",
-            "<img hspace=\"8\" src=\"\\1\\2\"> ",
+            //"<img hspace=\"8\" style=\"max-width:600px\" src=\"\\1\\2\"> ",
+            "<img hspace=\"8\" class=\"img-responsive\" src=\"\\1\\2\"> ",
             "<img hspace=\"8\" width=400 src=\"\\1\\2\"> ",
             "<font color=\"\\1\">\\2</font>",
             "\\1<li>\\2\n\\3",
@@ -316,7 +317,7 @@ function highlight_terms($text, $terms) {
     $replace = array();
 
     foreach ($search as $key => $value) {
-        $replace[$key] = "<span class=\"highlight\">".$value."</span>";
+        $replace[$key] = "<span class=\"mark\">".$value."</span>";
     }
     if (substr(phpversion(), 0, 1) > 4) {   // PHP 4.x doesn't support str_ireplace
         return str_ireplace($search, $replace, $text);
diff --git a/html/inc/util.inc b/html/inc/util.inc
index a68050cda4..2f0a924bfd 100644
--- a/html/inc/util.inc
+++ b/html/inc/util.inc
@@ -355,7 +355,7 @@ function end_table() {
 // Table header row with unlimited number of columns
 
 function table_header() {
-    echo "<tr>\n";
+    echo "<thead><tr>\n";
     for ($i = 0; $i < func_num_args(); $i++) {
         if (is_array(func_get_arg($i))) {
             $col = func_get_arg($i);
@@ -364,7 +364,7 @@ function table_header() {
             echo "<th valign=top>".func_get_arg($i)."</th>\n";
         }
     }
-    echo "</tr>\n";
+    echo "</tr></thead>\n";
 }
 
 // Table row with unlimited number of columns
diff --git a/html/project.sample/project.inc b/html/project.sample/project.inc
index bba34f1803..ec610820ce 100644
--- a/html/project.sample/project.inc
+++ b/html/project.sample/project.inc
@@ -72,12 +72,12 @@ function project_banner($title, $prefix) {
     // If you include any links, prepend URL with $prefix
     // if you need to open divs here close them in project_footer()
 
-    sample_navbar(secure_url_base(), get_logged_in_user(false), true);
+    sample_navbar(secure_url_base(), get_logged_in_user(false), false);
     if ($title) {
         echo "<h2>$title</h2>\n";
     }
 }
-$fixed_navbar = true;
+//$fixed_navbar = true;
 
 function project_footer($show_return, $show_date, $prefix) {
     // If you include any links, prepend URL with $prefix
diff --git a/html/user/forum_reply.php b/html/user/forum_reply.php
index 58c564cc15..e13cf64a70 100644
--- a/html/user/forum_reply.php
+++ b/html/user/forum_reply.php
@@ -166,8 +166,8 @@ function show_message_row($thread, $parent_post) {
         $enable_signature="";
     }
     $x2 .= "</textarea><p>
-        <input class=\"btn btn-default\" type=\"submit\" name=\"preview\" value=\"".tra("Preview")."\">
-        <input class=\"btn btn-primary\" type=\"submit\" value=\"".tra("Post reply")."\">
+        <input class=\"btn\" type=\"submit\" name=\"preview\" value=\"".tra("Preview")."\">
+        <input class=\"btn\" type=\"submit\" value=\"".tra("Post reply")."\">
         &nbsp;&nbsp;&nbsp;
         <input type=\"checkbox\" name=\"add_signature\" id=\"add_signature\" value=\"add_it\" ".$enable_signature.">
         <label for=\"add_signature\">".tra("Add my signature to this reply")."</label>