diff --git a/pages/genericPage.class.php b/pages/genericPage.class.php
index 729839c6..7aa0a3b9 100644
--- a/pages/genericPage.class.php
+++ b/pages/genericPage.class.php
@@ -429,7 +429,7 @@ class GenericPage
             $this->pageTemplate['activeTab'] = $this->tabId;
 
         header("HTTP/1.0 404 Not Found", true, 404);
-        $this->display('text-page-generic');
+        $this->display('list-page-generic');
         exit();
     }
 
@@ -447,7 +447,7 @@ class GenericPage
         Util::arraySumByKey($this->mysql, DB::Aowow()->getStatistics(), DB::World()->getStatistics());
 
         header("HTTP/1.0 404 Not Found", true, 404);
-        $this->display('text-page-generic');
+        $this->display('list-page-generic');
         exit();
     }
 
diff --git a/pages/more.php b/pages/more.php
index 8b922add..29ba3080 100644
--- a/pages/more.php
+++ b/pages/more.php
@@ -10,7 +10,7 @@ if (!defined('AOWOW_REVISION'))
 
 class MorePage extends GenericPage
 {
-    protected $tpl           = 'text-page-generic';
+    protected $tpl           = 'list-page-generic';
     protected $path          = [2];
     protected $tabId         = 2;
     protected $mode          = CACHE_TYPE_NONE;
diff --git a/pages/screenshot.php b/pages/screenshot.php
index 4b5fbe77..d0b14bcd 100644
--- a/pages/screenshot.php
+++ b/pages/screenshot.php
@@ -91,7 +91,7 @@ class ScreenshotPage extends GenericPage
                     header('Location: ?screenshot=thankyou&'.$this->destType.'.'.$this->destTypeId, true, 302);
                 die();
             case 'thankyou':
-                $this->tpl = 'text-page-generic';
+                $this->tpl = 'list-page-generic';
                 $this->handleThankyou();
                 break;
         }
diff --git a/template/pages/list-page-generic.tpl.php b/template/pages/list-page-generic.tpl.php
index e686b8f5..86f01611 100644
--- a/template/pages/list-page-generic.tpl.php
+++ b/template/pages/list-page-generic.tpl.php
@@ -9,20 +9,63 @@
 
     $this->brick('pageTemplate');
 
-    $this->brick('mapper');
-
-if (!empty($this->name) || !empty($this->h1Links) || !empty($this->extraHTML)):
-    echo '<div class="text">' .
-        (!empty($this->h1Links)   ? '<div class="h1-links">'.$this->h1Links.'</div>' : null) .
-        (!empty($this->name)      ? '<h1>'.$this->name.'</h1>'                       : null) .
-        (!empty($this->extraHTML) ? $this->extraHTML                                 : null) .
-    '</div>';
-endif;
-
-$this->brick('lvTabs');
+    if (isset($this->notFound)):
 ?>
+            <div class="pad3"></div>
 
-            <div class="clear"></div>
+            <div class="inputbox">
+                <h1><?=$this->notFound['title'];?></h1>
+                <div id="inputbox-error"><?=$this->notFound['msg'];?></div>
+<?php
+    else:
+?>
+            <div class="text">
+<?php
+        if (!empty($this->h1Links)):
+            echo '                <div class="h1-links">'.$this->h1Links.'</div>';
+        endif;
+
+        if (!empty($this->name)):
+            echo '                <h1>'.$this->name.'</h1>';
+        endif;
+
+        $this->brick('mapper');
+
+        $this->brick('article');
+
+        if (isset($this->extraText)):
+?>
+                <div id="text-generic" class="left"></div>
+                <script type="text/javascript">//<![CDATA[
+                    Markup.printHtml("<?=Util::jsEscape($this->extraText);?>", "text-generic", {
+                        allow: Markup.CLASS_ADMIN,
+                        dbpage: true
+                    });
+                //]]></script>
+
+                <div class="pad2"></div>
+<?php
+        endif;
+
+        if (isset($this->extraHTML)):
+            echo $this->extraHTML;
+        endif;
+
+    endif;
+
+    if (!empty($this->tabsTitle)):
+        echo '                <h2 class="clear">'.$this->tabsTitle.'</h2>';
+    endif;
+?>
+            </div>
+<?php
+    if (!empty($this->lvTabs)):
+        $this->brick('lvTabs');
+?>
+        <div class="clear"></div>
+<?php
+    endif;
+?>
         </div><!-- main-contents -->
     </div><!-- main -->
 
diff --git a/template/pages/text-page-generic.tpl.php b/template/pages/text-page-generic.tpl.php
deleted file mode 100644
index 0c566792..00000000
--- a/template/pages/text-page-generic.tpl.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php $this->brick('header'); ?>
-
-    <div class="main" id="main">
-        <div class="main-precontents" id="main-precontents"></div>
-        <div class="main-contents" id="main-contents">
-
-<?php
-$this->brick('announcement');
-
-$this->brick('pageTemplate');
-
-if (isset($this->notFound)):
-?>
-            <div class="pad3"></div>
-
-            <div class="inputbox">
-                <h1><?=$this->notFound['title'];?></h1>
-                <div id="inputbox-error"><?=$this->notFound['msg'];?></div>
-<?php
-else:
-?>
-            <div class="text">
-                <h1><?=$this->name;?></h1>
-
-<?php
-    $this->brick('article');
-
-    if (isset($this->extraText)):
-?>
-                <div id="text-generic" class="left"></div>
-                <script type="text/javascript">//<![CDATA[
-                    Markup.printHtml("<?=Util::jsEscape($this->extraText);?>", "text-generic", {
-                        allow: Markup.CLASS_ADMIN,
-                        dbpage: true
-                    });
-                //]]></script>
-
-                <div class="pad2"></div>
-<?php
-    endif;
-
-    if (isset($this->extraHTML)):
-        echo $this->extraHTML;
-    endif;
-
-endif;
-?>
-            </div>
-        </div><!-- main-contents -->
-    </div><!-- main -->
-
-<?php $this->brick('footer'); ?>