diff --git a/app.py b/app.py
index 18f8197..41aa279 100644
--- a/app.py
+++ b/app.py
@@ -108,12 +108,12 @@ def FUN_upload_image():
     if request.method == 'POST':
         # check if the post request has the file part
         if 'file' not in request.files:
-            flash('No file part')
+            flash('No file part', category='danger')
             return(redirect(url_for("FUN_private")))
         file = request.files['file']
         # if user does not select file, browser also submit a empty part without filename
         if file.filename == '':
-            flash('No selected file')
+            flash('No selected file', category='danger')
             return(redirect(url_for("FUN_private")))
         if file and allowed_file(file.filename):
             filename = secure_filename(file.filename)
diff --git a/templates/layout.html b/templates/layout.html
index 6a14379..fb6c5bf 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -19,13 +19,13 @@
 
         <div class="collapse navbar-collapse" id="myNavbar">
         <ul class="nav navbar-nav">
-            <li><a href="/">Home</a></li>
-            <li><a href="/public/">Public</a></li>
+            <li><a href="{{ url_for('FUN_root') }}">Home</a></li>
+            <li><a href="{{ url_for('FUN_public') }}">Public</a></li>
             {% if session.get("current_user", None) != None %}
-	       <li><a href="/private/">Private</a></li>
+	       <li><a href="{{ url_for('FUN_private') }}">Private</a></li>
 	    {% endif%}
             {% if session.get("current_user", None) == "ADMIN" %}
-	      <li><a href="/admin">Admin Dashboard</a></li>
+	      <li><a href="{{ url_for('FUN_admin') }}">Admin Dashboard</a></li>
 	    {% endif %}
         </ul>
         
@@ -43,7 +43,7 @@
         {% else %}
         <li>
               <a><b>{{ session.get("current_user") }}</b></a></li>
-              <li><a href="/logout"><b><u>Logout</u></b></a>
+              <li><a href="{{ url_for('FUN_logout') }}"><b><u>Logout</u></b></a>
           </li>
         {% endif %}
         </ul>
@@ -52,6 +52,16 @@
     </div>
     </nav>
 
+{% with messages = get_flashed_messages(with_categories=true) %}
+    {% if messages %}
+        {% for category, message in messages %}
+            <div class="alert alert-{{ category }}">
+                {{ message }}
+            </div>
+        {% endfor %}
+    {% endif %}
+{% endwith %}
+
 
 <div class="container">