diff --git a/Chapter_2_Go_ChitChat/chitchat/templates/layout.html b/Chapter_2_Go_ChitChat/chitchat/templates/layout.html
index e9cfe61d..8d3cbd03 100644
--- a/Chapter_2_Go_ChitChat/chitchat/templates/layout.html
+++ b/Chapter_2_Go_ChitChat/chitchat/templates/layout.html
@@ -1,5 +1,3 @@
-{{ define "layout" }}
-
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -23,5 +21,3 @@
     <script src="/static/js/bootstrap.min.js"></script>
   </body>
 </html>
-
-{{ end }}
\ No newline at end of file
diff --git a/Chapter_2_Go_ChitChat/chitchat/templates/login.layout.html b/Chapter_2_Go_ChitChat/chitchat/templates/login.layout.html
index 5fa0df0e..0db1da1c 100644
--- a/Chapter_2_Go_ChitChat/chitchat/templates/login.layout.html
+++ b/Chapter_2_Go_ChitChat/chitchat/templates/login.layout.html
@@ -1,5 +1,3 @@
-{{ define "layout" }}
-
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -12,6 +10,8 @@
     <link href="/static/css/login.css" rel="stylesheet">
   </head>
   <body>
+    {{ template "navbar" . }}
+
     <div class="container">
       
       {{ template "content" . }}
@@ -23,4 +23,3 @@
   </body>
 </html>
 
-{{ end }}
\ No newline at end of file
