diff --git a/templates/layout.html b/templates/layout.html
index f7e5884..5798872 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -2,9 +2,63 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>$Title$</title>
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename = 'bootstrap4.min.css') }}" />
+    <script src="{{ url_for('static', filename = 'jquery-3.2.1.min.js') }}"></script>
+    <script src="{{ url_for('static', filename = 'bootstrap4.min.js') }}" ></script>
+    <script src="{{ url_for('static', filename ='fontawesome-all.js') }}"></script>
+    <title>{{ title }} - Tweeder</title>
 </head>
 <body>
-$END$
+    <nav class="navbar navbar-expand-lg navbar-light bg-light" style="margin-bottom: 20px">
+
+            <div class="navbar-header">
+              <a class="navbar-brand" href="#">Tweeder</a>
+            </div>
+            <ul class="navbar-nav mr-auto">
+                <li class="nav-item {% block nav_timeline %}{% endblock %}"><a href="/timeline" class="nav-link">Timeline</a></li>
+                <li class="nav-item {% block nav_profile %}{% endblock %}"><a href="/profile" class="nav-link">My Profile</a></li>
+                <li class="nav-item {% block nav_global %}{% endblock %}"><a href="/global" class="nav-link">Global Timeline</a></li>
+                <li class="nav-item {% block nav_messages %}{% endblock %}"><a href="/messages" class="nav-link">Messages</a></li>
+                <li class="nav-item"><a href="#" data-toggle="modal" data-target="#newPost" class="nav-link">New Post</a></li>
+            </ul>
+
+            {% if logged_in %}
+                <ul class="nav navbar-nav navbar-right">
+                    <li class="nav-item"><a href="/logout" class="nav-link"><i class="far fa-sign-out"></i> Log out</a></li>
+                </ul>
+            {% else %}
+                <ul class="nav navbar-nav navbar-right">
+                    <li class="nav-item"><a href="/login" class="nav-link"><i class="far fa-sign-in"></i> Log in</a></li>
+                    <li class="nav-item"><a href="/register" class="nav-link"><i class="far fa-user-plus"></i> Sign up</a></li>
+                </ul>
+            {% endif %}
+
+    </nav>
+
+    {% block content %}
+    {% endblock %}
+
+    <div class="modal fade" id="newPost" tabindex="-1" role="dialog">
+        <form id="newPostForm" method="POST" action="/newpost" />
+            <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                  <div class="modal-header">
+                      <h4 class="modal-title">New Post</h4>
+                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                  </div>
+                  <div class="modal-body">
+                    <input type="text" class="form-control" name="status" placeholder="Status..." />
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-primary">Do Post</button>
+                  </div>
+                </div><!-- /.modal-content -->
+            </div><!-- /.modal-dialog -->
+        </form>
+    </div><!-- /.modal -->
+
+
+
 </body>
 </html>
\ No newline at end of file
