diff --git a/includes/Folc.php b/includes/Folc.php
index ac16b9a..2de8345 100644
--- a/includes/Folc.php
+++ b/includes/Folc.php
@@ -25,6 +25,8 @@ public function getTemplateData() {
             $data['edit_tab'] = 'active';
         } else if ( $wgRequest->getText( 'action' ) == "history" ) {
             $data['history_tab'] = 'active';
+        } else if ( $wgTitle->getNamespace() == 1 ) {
+            $data['discussion_tab'] = 'active';
         } else {
             $data['read_tab'] = 'active';
         }
diff --git a/templates/article.mustache b/templates/article.mustache
index 6c05d15..0f99dcc 100644
--- a/templates/article.mustache
+++ b/templates/article.mustache
@@ -5,17 +5,17 @@
                 <div class="col-xl-5 align-self-center text-uppercase text-gray d-none d-xl-block"><span>Read</span> Mode</div> 
                 <div class="col-xl-4 align-self-end">
                     <ul class="nav  mt-1 mt-md-2 nav-pills nav-fill border-bottom-0 active" id="countries-tab" role="tablist">
-                        <li class="nav-item active">
-                            <a href="/{{pagetitle}}" class="nav-link bg-transparent text-dark-gray py-2 {{read_tab}}" data-toggle="" data-target="#read" role="tab" aria-selected="true">Read</a>
+                        <li class="nav-item {{read_tab}}">
+                            <a href="/{{pagetitle}}" class="nav-link text-dark-gray py-1 py-md-2 {{read_tab}}" data-toggle="" data-target="#read" role="tab" aria-selected="true">Read</a>
                         </li>
-                        <li class="nav-item">
-                            <a href="/{{pagetitle}}?action=formedit" class="nav-link bg-transparent text-dark-gray py-2 {{edit_tab}}" data-toggle="" data-target="" role="tab" aria-selected="false">Edit</a>
+                        <li class="nav-item {{edit_tab}}">
+                            <a href="/{{pagetitle}}?action=formedit" class="nav-link text-dark-gray py-1 py-md-2 {{edit_tab}}" data-toggle="" data-target="" role="tab" aria-selected="false">Edit</a>
                         </li>
-                        <li class="nav-item">
-                            <a href="/Talk:{{pagetitle}}" class="nav-link bg-transparent text-dark-gray py-2" data-toggle="" data-target="" role="tab" aria-selected="false">Discussion</a>
+                        <li class="nav-item {{discussion_tab}}">
+                            <a href="/Talk:{{pagetitle}}" class="nav-link text-dark-gray py-1 py-md-2 {{discussion_tab}}" data-toggle="" data-target="" role="tab" aria-selected="false">Discussion</a>
                         </li>
-                        <li class="nav-item">
-                            <a href="/{{pagetitle}}?action=history" class="nav-link bg-transparent text-dark-gray py-2 {{history_tab}}" data-toggle="" data-target="" role="tab" aria-selected="false">History</a>
+                        <li class="nav-item {{history_tab}}">
+                            <a href="/{{pagetitle}}?action=history" class="nav-link text-dark-gray py-1 py-md-2 {{history_tab}}" data-toggle="" data-target="" role="tab" aria-selected="false">History</a>
                         </li>
                     </ul>
                 </div>