diff --git a/src/_templates/article.html b/src/_templates/article.html
index 7dc13de..7fc5527 100644
--- a/src/_templates/article.html
+++ b/src/_templates/article.html
@@ -14,17 +14,14 @@
       aria-label="main navigation"
     >
       <div class="navbar-brand">
-        <a class="navbar-item" href="#">
-          <strong>Static Translated Site Generator</strong>
+        <a class="navbar-item" href="{article_overview_href}">
+          <strong>{article_language_flag} Static Translated Site Generator</strong>
         </a>
       </div>
     </nav>
 
     <!-- Main Content -->
     <section class="section">
-      <div class="content">
-        <a href="../">Go Back</a>
-      </div>
       <div class="content">
         {article_content}
       </div>
diff --git a/stsg/build.py b/stsg/build.py
index 119e704..e2da8f4 100644
--- a/stsg/build.py
+++ b/stsg/build.py
@@ -143,6 +143,7 @@ class Article(CustomPath):
         return {
             "article_content": article_content,
             "article_preview": article_content[:ARTICLE_PREVIEW_LENGTH],
+            "article_overview_href": "/"  + str(self.path.parent),
             "article_href": "/"  + str(self.path.parent / self.stem),
             "article_language_name": self.language_code.native_name,
             "article_language_code": self.language_code.language_code,