diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py
index 0c0f0e8..6b3c223 100644
--- a/prosopopee/prosopopee.py
+++ b/prosopopee/prosopopee.py
@@ -158,6 +158,7 @@ def main():
         gallery_title = gallery_settings["title"]
         gallery_sub_title = gallery_settings.get("sub_title", "")
         gallery_date = gallery_settings["date"] if "date" in gallery_settings else ""
+        gallery_tags = gallery_settings["tags"] if "date" in gallery_settings else ""
 
         if gallery_settings.get("public", True):
             front_page_galleries_cover.append({
@@ -165,6 +166,7 @@ def main():
                 "link": gallery,
                 "sub_title": gallery_sub_title,
                 "date": gallery_date,
+                "tags": gallery_tags,
                 "cover": cover_image_path,
             })
 
@@ -179,10 +181,11 @@ def main():
 
     front_page_galleries_cover = reversed(sorted(front_page_galleries_cover, key=lambda x: x["date"]))
 
-    for item in settings.get("menu", []):
-        file_name, menu_name = item.items()[0]
-        error(os.path.exists(os.path.join(os.getcwd(), file_name + ".yaml")), "I can't find a " + file_name + ".yaml in the current working directory as specified by your menu description in your root settings.yaml")
-        open(os.path.join("build", file_name + ".html"), "w").write(page_template.render(settings=settings, pages=yaml.safe_load(open(file_name + ".yaml", "r")), galleries=front_page_galleries_cover).encode("Utf-8"))
+    for item in settings.get("menu"):
+        if item.get("type") == "page":
+            file_name = item.get("url")
+            error(os.path.exists(os.path.join(os.getcwd(), file_name + ".yaml")), "I can't find a " + file_name + ".yaml in the current working directory as specified by your menu description in your root settings.yaml")
+            open(os.path.join("build", file_name + ".html"), "w").write(page_template.render(settings=settings, pages=yaml.safe_load(open(file_name + ".yaml", "r")), galleries=front_page_galleries_cover).encode("Utf-8"))
 
     Image.base_dir = os.getcwd()
     Image.target_dir = os.path.join(os.getcwd(), "build")
@@ -192,3 +195,4 @@ def main():
 
 if __name__ == '__main__':
     main()
+
diff --git a/prosopopee/static/css/style.css b/prosopopee/static/css/style.css
index fc5ca08..d3e2a59 100644
--- a/prosopopee/static/css/style.css
+++ b/prosopopee/static/css/style.css
@@ -90,7 +90,7 @@ a {
     text-align: center;
     z-index: 3;
     background: transparent linear-gradient(rgba(255, 255, 255, 0) 0%, transparent 1%, rgba(0, 0, 0, 0.07) 26%, rgba(0, 0, 0, 0.5) 71%, rgba(0, 0, 0, 0.7) 100%) repeat scroll 0% 0%;
-    padding: 20% 0 0;
+    padding: 20% 0 10px 0;
 }
 
 .gallery-header {
@@ -145,7 +145,6 @@ a {
 }
 
 .gallery-datetime {
-    margin-bottom: 1em;
     font-family: 'crimson', serif;
     text-transform: uppercase;
     letter-spacing: 2px;
@@ -233,3 +232,23 @@ nav ul li > a.item-menu::before {
     line-height: 1;
     color: #ebebeb;
 }
+
+.gallery-tag {
+   font-size: 13px;
+   text-transform: uppercase;
+   font-style: normal;
+   display: inline;
+   font-family: "adobe-garamond-pro", serif;
+}
+
+.gallery-tag span {
+    font-size: 12px;
+    border-bottom: solid 1px rgba(255,255,255,0.2);
+    display: inline-block;
+    margin: 0 0 0 3px;
+    font-weight: bold;
+    font-family: "europa", sans-serif;
+    text-transform: uppercase;
+    letter-spacing: 3px;
+    font-style: normal;
+}
diff --git a/prosopopee/templates/index.html b/prosopopee/templates/index.html
index a94247e..03b880f 100644
--- a/prosopopee/templates/index.html
+++ b/prosopopee/templates/index.html
@@ -11,6 +11,7 @@
           <h2>{{ gallery.title }}</h2>
           {% if gallery.sub_title %}<h3>{{ gallery.sub_title }}</h3>{% endif %}
           {% if gallery.date %}<div class="gallery-datetime">{{ gallery.date.strftime("%d %B %Y") }}</div>{% endif %}
+	  {% if gallery.tags %}<div class="gallery-tag">IN {% for tag in gallery.tags -%} <span>{{ tag }}</span> {% endfor -%}</div>{% endif %}
         </div>
       </a>
       {% set cover = Image(gallery.cover) %}
@@ -21,6 +22,5 @@
   </div>
   {% endfor %}
 </div>
-
 <p style="visibility: hidden">.</p>
 {% endblock %}
diff --git a/prosopopee/templates/menu.html b/prosopopee/templates/menu.html
index 90f2fb6..16b8ef4 100644
--- a/prosopopee/templates/menu.html
+++ b/prosopopee/templates/menu.html
@@ -1,14 +1,20 @@
       <nav>
         <div class="nav-wrapper">
           <ul>
-            {% for line in settings.menu -%}
-            {% set file_name, menu_name = line.items()[0] %}
-            {% if loop.first %}
-            <li><a href={{ file_name }}.html class=first-item-menu>{{ menu_name }}</a></li>
+            {%- for line in settings.menu -%}
+	      {%- if line.type == "folder" -%}
+	        {%- set file_name = line.url+"/" -%}
+	      {%- elif line.type == "external" -%}
+	        {%- set file_name = line.url -%}
+	      {%- else -%}
+	        {%- set file_name = line.url+".html" -%}
+              {%- endif -%}
+            {%- if loop.first -%}
+            <li><a href={{ file_name }} class=first-item-menu>{{ line.name  }}</a></li>
             {% else %}
-            <li><a href={{ file_name }}.html class=item-menu>{{ menu_name }}</a></li>
-            {% endif %}
-            {% endfor -%}
+            <li><a href={{ file_name }} class=item-menu>{{ line.name }}</a></li>
+            {%- endif -%}
+            {%- endfor -%}
           </ul>
         </div>
       </nav>