diff --git a/html/inc/forum.inc b/html/inc/forum.inc
index 361ef94c44..52db8f6eef 100644
--- a/html/inc/forum.inc
+++ b/html/inc/forum.inc
@@ -204,6 +204,10 @@ function show_team_forum_title($forum, $thread=null, $link_thread=false) {
     echo "</span>";
 }
 
+// start a table containing messages, where the layout is fixed
+// (to accommodate long [pre] lines)
+// and the left column (author info) has fixed size
+//
 function start_forum_table($headings) {
     $a = array();
     foreach ($headings as $h) {
@@ -1229,7 +1233,8 @@ function is_moderator($user, $forum) {
 }
 
 function show_thread_and_context_header() {
-    start_forum_table(array(
+    start_table('table-striped');
+    row_heading_array(array(
         tra("Thread"),
         tra("Posts"),
         tra("Author"),
diff --git a/html/user/forum_forum.php b/html/user/forum_forum.php
index 7a7fac0ac1..6cb95cc685 100644
--- a/html/user/forum_forum.php
+++ b/html/user/forum_forum.php
@@ -134,7 +134,8 @@ function show_forum($forum, $start, $sort_style, $user) {
         $start
     );
     echo $page_nav;
-    start_forum_table(array(
+    start_table('table-striped');
+    row_heading_array(array(
         "",
         tra("Threads"),
         tra("Posts"),
diff --git a/html/user/forum_help_desk.php b/html/user/forum_help_desk.php
index 73fbfda4dc..abfa226c1d 100644
--- a/html/user/forum_help_desk.php
+++ b/html/user/forum_help_desk.php
@@ -42,7 +42,8 @@ foreach ($categories as $category) {
         show_forum_title($category, null, null);
         echo "<p>";
         show_mark_as_read_button($user);
-        start_forum_table(array(
+        start_table('table-striped');
+        row_heading_array(array(
             tra("Topic"),
             tra("Questions"),
             tra("Last post")
diff --git a/html/user/forum_index.php b/html/user/forum_index.php
index 3745bd4d85..3ae1fd9ecd 100644
--- a/html/user/forum_index.php
+++ b/html/user/forum_index.php
@@ -90,7 +90,8 @@ foreach ($categories as $category) {
         show_forum_title($category, NULL, NULL);
         echo "<p>";
         show_mark_as_read_button($user);
-        start_forum_table(array(
+        start_table('table-striped');
+        row_heading_array(array(
             tra("Topic"),
             tra("Threads"),
             tra("Posts"),
diff --git a/html/user/forum_reply.php b/html/user/forum_reply.php
index 228bfebb1a..0eddd7f89d 100644
--- a/html/user/forum_reply.php
+++ b/html/user/forum_reply.php
@@ -123,6 +123,7 @@ if ($preview == tra("Preview")) {
 start_table();
 show_message_row($thread, $parent_post);
 end_table();
+
 if ($parent_post) {
     start_forum_table(array(tra("Author"), tra("Message")));
     show_post(
@@ -133,8 +134,6 @@ if ($parent_post) {
     show_posts($thread, $forum, 0, 0, CREATE_TIME_NEW, 0, $logged_in_user);
 }
 
-end_table();
-
 page_tail();
 
 function show_message_row($thread, $parent_post) {
diff --git a/html/user/team_search.php b/html/user/team_search.php
index bf087603cc..3a99b083ee 100644
--- a/html/user/team_search.php
+++ b/html/user/team_search.php
@@ -102,7 +102,7 @@ function show_list($list) {
         }
         echo "
             <td><p class=\"text-muted\">".sanitize_html($team->description)."</p></td>
-            <td>".format_credit($team->expavg_credit)."</td>
+            <td align=right>".format_credit($team->expavg_credit)."</td>
             <td>$type</td>
             <td>$team->country</td>
             </tr>