diff --git a/CHANGELOG.md b/CHANGELOG.md
index aadc848b..33f4dc0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
 
 # CHANGELOG
 
+*1.2.5* (2018-09-07)
+  - epfl-video: render HTML
+  - epfl-links-group: render HTML
+  - epfl-cover: render HTML
+  - epfl-toggle: render HTML
+  - epfl-memento: fix resolution image 448x448
+  - epfl-news: fix div tag badly closed PR#74
+  - Custom highlight handle image with caption, legend, alt etc..
+  - Name menu location, change default name from 'primary' to 'top' to match 2010 theme, prepare for footer
+
 *1.2.4* (2018-08-30)
   - remove top padding on homepage
   - hotfix overflow hidden events 
diff --git a/VERSION b/VERSION
index e8ea05db..c813fe11 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.4
+1.2.5
diff --git a/functions.php b/functions.php
index 98d59fd9..767f5035 100644
--- a/functions.php
+++ b/functions.php
@@ -7,6 +7,12 @@
  * @package epfl
  */
 
+global $EPFL_MENU_LOCATION;
+$EPFL_MENU_LOCATION = 'top';
+
+global $EPFL_FOOTER_MENU_LOCATION;
+$EPFL_FOOTER_MENU_LOCATION = 'footer_nav';
+
 if ( ! function_exists( 'epfl_setup' ) ) :
 	/**
 	 * Sets up theme defaults and registers support for various WordPress features.
@@ -43,9 +49,12 @@ function epfl_setup() {
 		add_theme_support( 'post-thumbnails' );
 
 		// This theme uses wp_nav_menu() in one location.
-		register_nav_menus( array(
-			'primary' => esc_html__( 'Primary', 'epfl' ),
-		) );
+		global $EPFL_MENU_LOCATION;
+		global $EPFL_FOOTER_MENU_LOCATION;
+		$nav_menus_args = [];
+		$nav_menus_args[$EPFL_MENU_LOCATION] = esc_html__( 'Primary', 'epfl' );
+		$nav_menus_args[$EPFL_FOOTER_MENU_LOCATION] = esc_html__( 'Footer', 'epfl' );
+		register_nav_menus($nav_menus_args);
 
 		/*
 		 * Switch default core markup for search form, comment form, and comments
@@ -298,8 +307,8 @@ function get_archives_link_mod ( $link_html ) {
  * @return string
  */
 function get_current_menu_slug() {
-	$theme_location = 'primary';
+    global $EPFL_MENU_LOCATION;
   $menu_locations = get_nav_menu_locations();
-  $menu_term = get_term($menu_locations[$theme_location], 'nav_menu');
+  $menu_term = get_term($menu_locations[$EPFL_MENU_LOCATION], 'nav_menu');
 	return $menu_term;
 }
diff --git a/header.php b/header.php
index 849f7af6..31686804 100644
--- a/header.php
+++ b/header.php
@@ -30,7 +30,10 @@
 		</a>
 
 			<?php
+			    global $EPFL_MENU_LOCATION;
 				wp_nav_menu( array(
+				    'theme_location' => $EPFL_MENU_LOCATION,
+        		    'menu_id'        => $EPFL_MENU_LOCATION.'-menu',
 					'menu_class'=> 'nav-header d-none d-xl-flex',
 					'container' => 'ul',
 					'depth' => 1
diff --git a/shortcodes/collapsable/controller.php b/shortcodes/collapsable/controller.php
deleted file mode 100644
index d7825edb..00000000
--- a/shortcodes/collapsable/controller.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-require_once(__DIR__.'/shortcake.php');
-
-// add shortcode
-add_action( 'init', function() {
-  add_shortcode( 'epfl_collapsable', 'renderCollapsable' );
-});
-
-function renderCollapsable ($args) {
-  set_query_var('epfl_collapsable_data', $args);
-
-  ob_start();
-
-  if (is_admin()) {
-    // render placeholder for backend editor
-    set_query_var('epfl_placeholder_title', 'Collapsable');
-    get_template_part('shortcodes/placeholder');
-  } else {
-    // render shortcode
-    get_template_part('shortcodes/collapsable/view');
-  }
-
-  return ob_get_clean();
-}
diff --git a/shortcodes/collapsable/shortcake.php b/shortcodes/collapsable/shortcake.php
deleted file mode 100644
index 1afe7202..00000000
--- a/shortcodes/collapsable/shortcake.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-// register shortcake UI
-add_action( 'register_shortcode_ui', 'epfl_collapsable' );
-function epfl_collapsable() {
-  $fields = [];
-  for ( $i = 0; $i < 10; $i++) {
-    array_push($fields, [
-      'label' => '<hr><hr><h3>' . esc_html__('Title', 'epfl') . '</h3>',
-      'attr' => 'label'.$i,
-      'description' => esc_html__('The title of the collapsable', 'epfl'),
-      'type' => 'text',
-    ]);
-    array_push($fields, [
-      'label' => '<h2>' .esc_html__('Description', 'epfl') . '</h2>' ,
-      'attr' => 'desc'.$i,
-      'description' => esc_html__('Content shown when collapsable is opened', 'epfl'),
-      'type' => 'textarea',
-    ]);
-  }
-
-  global $iconDirectory;
-	shortcode_ui_register_for_shortcode(
-		'epfl_collapsable',
-		array(
-      'label' => esc_html__( 'Collapsable', 'epfl'),
-      'attrs' => $fields,
-      'listItemImage' => '<img src="'.$iconDirectory.'toggle.png'.'">',
-    )
-	);
-}
diff --git a/shortcodes/collapsable/view.php b/shortcodes/collapsable/view.php
deleted file mode 100644
index c20eee2f..00000000
--- a/shortcodes/collapsable/view.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-  $data = get_query_var('epfl_collapsable_data');
-  $id = uniqid();
-  $skipNext = false;
-?>
-
-<?php foreach ($data as $key => $value) : ?>
-
-  <?php 
-  // if value is empty, skip this entry
-  if ($skipNext) {
-    $skipNext = false;
-    continue;
-  }
-
-  if (strlen($value) === 0) {
-    $skipNext = true;
-    continue;
-  }
-  ?>
-
-  <?php if (strpos($key, 'label') === 0) : ?>
-    <button
-    class="collapse-title collapse-title-desktop collapsed"
-    type="button"
-    data-toggle="collapse"
-    data-target="#<?php echo $id.'-'.substr($key,5,1) ?>"
-    aria-expanded="false"
-    aria-controls="<?php echo $id.'-'.substr($key,5,1) ?>"
-  >
-    <?php echo $value; ?>
-  </button>
-  <?php else: ?>
-    <div class="collapse collapse-item collapse-item-desktop" id="<?php echo $id.'-'.substr($key,4,1) ?>">
-    <p>
-      In The Sixth Sense, Bruce Willis is in fact a ghost. (I told you XD)
-    </p>
-  </div>
-  <?php endif; ?>
-
-<?php endforeach; ?>
diff --git a/shortcodes/custom_highlight/view.php b/shortcodes/custom_highlight/view.php
index 34a2cb5c..01a15ee2 100644
--- a/shortcodes/custom_highlight/view.php
+++ b/shortcodes/custom_highlight/view.php
@@ -1,28 +1,34 @@
-<?php 
+<?php
 $data = get_query_var('epfl_custom_highlight_data');
 
 // manage layout
 $classes = '';
 if ($data['layout'] == 'bottom') $classes = 'fullwidth-teaser-horizontal';
 if ($data['layout'] == 'left') $classes = 'fullwidth-teaser-left';
-
+if ($data['layout'] == '') $classes = 'fullwidth-teaser-right';
 ?>
 
 <div class="container-full">
   <div class="fullwidth-teaser mt-5  <?php echo $classes; ?>">
-    <picture>
-      <?php echo wp_get_attachment_image(
-        $data['image'],
-        'thumbnail_16_9_large', // see functions.php
-        '',
-        [
-          'class' => 'img-fluid'
-        ]
-      ) ?>
-      <img src="<?php echo $data['image'] ?>" aria-labelledby="background-label" alt="An image description"
-      />
-    </picture>
-
+    <figure itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject" class="cover">
+      <!-- <picture> -->
+        <?php // get/slice image informations
+        $image_src = wp_get_attachment_image_src($data['image'], 'thumbnail_16_9_large')[0]; // see functions.php
+        $image_caption = wp_get_attachment_caption($data['image']);
+        $image_alt = get_post_meta($data['image'] , '_wp_attachment_image_alt', true);
+         ?>
+        <img src="<?php echo $image_src ?>" alt="<?php echo $image_alt ?>" />
+      <!-- </picture> -->
+      <?php if ($image_caption): ?>
+        <figcaption>
+          <button aria-hidden="true" type="button" class="btn-circle" data-toggle="popover" data-content="<?php echo $image_caption ?>">
+            <svg class="icon" aria-hidden="true"><use xlink:href="#icon-info"></use></svg>
+            <svg class="icon icon-rotate-90" aria-hidden="true"><use xlink:href="#icon-chevron-right"></use></svg>
+          </button>
+          <p class="sr-only"><?php echo $image_caption ?></p>
+        </figcaption>
+      <?php endif; ?>
+    </figure>
     <div class="fullwidth-teaser-text">
 
       <div class="fullwidth-teaser-header">
@@ -47,4 +53,4 @@
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/shortcodes/epfl_card/controller.php b/shortcodes/epfl_card/controller.php
new file mode 100644
index 00000000..7f9e7e6c
--- /dev/null
+++ b/shortcodes/epfl_card/controller.php
@@ -0,0 +1,27 @@
+<?php
+
+/** 
+ * 3rd argument is the priority, higher means executed first
+ * 4rth argument is number of arguments the function can accept
+ **/
+
+add_action('epfl_card_action', 'renderCard', 10, 4);
+
+function renderCard ($title, $text, $link, $image) {
+
+  if (is_admin()) {
+
+    // render placeholder for backend editor
+    set_query_var('epfl_placeholder_title', 'Card');
+    get_template_part('shortcodes/placeholder');
+
+  } else {
+
+    set_query_var('epfl_card_title', $title);
+    set_query_var('epfl_card_text', $text);
+    set_query_var('epfl_card_link', $link);
+    set_query_var('epfl_card_image', $image);
+    get_template_part('shortcodes/epfl_card/view');
+
+  }
+}
diff --git a/shortcodes/epfl_card/view.php b/shortcodes/epfl_card/view.php
new file mode 100644
index 00000000..406bd321
--- /dev/null
+++ b/shortcodes/epfl_card/view.php
@@ -0,0 +1,18 @@
+<?php
+    $title = get_query_var('epfl_card_title');
+    $text  = get_query_var('epfl_card_text');
+    $link  = get_query_var('epfl_card_link');
+    $image = get_query_var('epfl_card_image');
+?>
+
+<a href="<?php echo $link; ?>" class="card link-trapeze-horizontal">
+  <?php if ($image): ?> 
+  <picture class="card-img-top">
+    <img src="<?php echo $image; ?>" class="img-fluid" title="<?php echo $title; ?>" alt="<?php echo $title; ?>" />
+  </picture>
+  <?php endif ?>
+  <div class="card-body">
+    <h3 class="card-title"><?php echo $title; ?></h3>
+    <p><?php echo $text; ?></p>
+  </div>
+</a>
\ No newline at end of file
diff --git a/shortcodes/epfl_cover/controller.php b/shortcodes/epfl_cover/controller.php
new file mode 100644
index 00000000..286ed4ce
--- /dev/null
+++ b/shortcodes/epfl_cover/controller.php
@@ -0,0 +1,26 @@
+<?php
+
+/** 
+ * 3rd argument is the priority, higher means executed first
+ * 4rth argument is number of arguments the function can accept
+ **/
+
+add_action('epfl_cover_action', 'renderCover', 10, 2);
+
+function renderCover ($image, $description) {
+
+  if (is_admin()) {
+
+    // render placeholder for backend editor
+    set_query_var('epfl_placeholder_title', 'Cover');
+    get_template_part('shortcodes/placeholder');
+
+  } else {
+
+    // render for frontend
+    set_query_var('epfl_cover_image', $image);
+    set_query_var('epfl_cover_description', $description);
+    get_template_part('shortcodes/epfl_cover/view');
+
+  }
+}
\ No newline at end of file
diff --git a/shortcodes/epfl_cover/view.php b/shortcodes/epfl_cover/view.php
new file mode 100644
index 00000000..dd4242a8
--- /dev/null
+++ b/shortcodes/epfl_cover/view.php
@@ -0,0 +1,25 @@
+<?php
+    $description = get_query_var('epfl_cover_description');
+    $image = get_query_var('epfl_cover_image');
+?>
+
+<div class="container">
+  <figure class="cover">
+    <picture>
+      <img src="<?php echo $image; ?>" class="img-fluid" alt="<?php echo $description; ?>">
+    </picture>
+    <figcaption>
+      <button
+        aria-hidden="true"
+        type="button"
+        class="btn-circle"
+        data-toggle="popover"
+        data-content="<?php echo $description; ?>"
+      >
+        <svg class="icon" aria-hidden="true"><use xlink:href="#icon-info"></use></svg>
+        <svg class="icon icon-rotate-90" aria-hidden="true"><use xlink:href="#icon-chevron-right"></use></svg>
+      </button>
+      <p class="sr-only"><?php echo $description; ?></p>
+      </figcaption>
+  </figure>
+</div>
\ No newline at end of file
diff --git a/shortcodes/epfl_links_group/controller.php b/shortcodes/epfl_links_group/controller.php
new file mode 100644
index 00000000..8fea0dec
--- /dev/null
+++ b/shortcodes/epfl_links_group/controller.php
@@ -0,0 +1,36 @@
+<?php
+
+/** 
+ * 3rd argument is the priority, higher means executed first
+ * 4rth argument is number of arguments the function can accept
+ **/
+
+add_action('epfl_links_group_action', 'renderLinksGroup', 10, 1);
+
+function renderLinksGroup ($args) {
+
+  if (is_admin()) {
+
+    // render placeholder for backend editor
+    set_query_var('epfl_placeholder_title', 'Links group');
+    get_template_part('shortcodes/placeholder');
+
+  } else {
+
+    set_query_var('epfl_links_group_main_url', $args['main_url']);
+    set_query_var('epfl_links_group_title', $args['title']);
+
+    unset($args['main_url']);
+    unset($args['title']);
+
+    $links = [];
+    foreach ($args as $key => $value) {
+      $field_key = substr($key, -1);
+      $field_name = substr($key, 0, -1);  
+      $links[$field_key][$field_name] = $value;
+    }
+    set_query_var('epfl_links_group_links', $links);
+    
+    get_template_part('shortcodes/epfl_links_group/view');
+  }
+}
\ No newline at end of file
diff --git a/shortcodes/epfl_links_group/view.php b/shortcodes/epfl_links_group/view.php
new file mode 100644
index 00000000..5e051a60
--- /dev/null
+++ b/shortcodes/epfl_links_group/view.php
@@ -0,0 +1,24 @@
+<?php
+    $links    = get_query_var('epfl_links_group_links');
+    $main_url = get_query_var('epfl_links_group_main_url');
+    $title    = get_query_var('epfl_links_group_title');
+    $is_links_teaser = ("" !== $main_url);
+?>
+<div class="links-group <?php if ($is_links_teaser):?>links-group-teaser<?php endif; ?>">
+  <h5 id="links-group-title">
+    <?php if($is_links_teaser): ?>
+    <a class="link-pretty" href="<?php echo $main_url; ?>"><?php echo $title; ?></a>
+    <?php else: ?>
+    <?php echo $title; ?>
+    <?php endif; ?>
+  </h5>
+  <nav
+    class="nav flex-column flex-wrap align-items-start"
+    role="navigation"
+    aria-labelledby="links-group-title"
+  >
+  <?php foreach($links as $link): ?>
+    <a class="nav-link link-pretty" href="<?php echo $link['url']; ?>"><?php echo $link['label']; ?></a>
+  <?php endforeach ?>
+  </nav>
+</div>
\ No newline at end of file
diff --git a/shortcodes/epfl_memento/templates/card-img-top.php b/shortcodes/epfl_memento/templates/card-img-top.php
index e47eb66b..4f122e98 100644
--- a/shortcodes/epfl_memento/templates/card-img-top.php
+++ b/shortcodes/epfl_memento/templates/card-img-top.php
@@ -3,10 +3,12 @@
 require_once(get_template_directory().'/shortcodes/epfl_memento/data.php');
 $data = get_event();
 
+$visual_url = substr($data->visual_url, 0, -11) . '448x448.jpg';
+
 //display nothing if no image available
 if (!$data->visual_url) return '';
 ?>
 
 <picture class="card-img-top">
-    <img src="<?php echo $data->visual_url ?>" class="img-fluid" title="<?php echo $data->image_description ?>" alt="<?php echo $data->image_description ?>" />
+    <img src="<?php echo $visual_url ?>" class="img-fluid" title="<?php echo $data->image_description ?>" alt="<?php echo $data->image_description ?>" />
 </picture>
\ No newline at end of file
diff --git a/shortcodes/epfl_news/view.php b/shortcodes/epfl_news/view.php
index 43d92d01..bafae191 100644
--- a/shortcodes/epfl_news/view.php
+++ b/shortcodes/epfl_news/view.php
@@ -158,13 +158,15 @@
   <?php endif; ?>
 <?php endif; ?>
 
-<?php if ("true" == $display_all_news_link and $template == 2 and $last == $count): ?>
+<?php if ($template == 2 and $last == $count): ?>
       </div>
+      <?php if ("true" == $display_all_news_link): ?>
       <p class="text-center">
         <a class="link-pretty" href="https://actu.epfl.ch/search/mediacom/">
           <?php esc_html_e('All news', 'epfl' );?>
         </a>
       </p>
+      <?php endif; ?>
     </div>
   </div>
 </div>
diff --git a/shortcodes/epfl_toggle/controller.php b/shortcodes/epfl_toggle/controller.php
new file mode 100644
index 00000000..6a6b54dd
--- /dev/null
+++ b/shortcodes/epfl_toggle/controller.php
@@ -0,0 +1,29 @@
+<?php
+
+/** 
+ * 3rd argument is the priority, higher means executed first
+ * 4rth argument is number of arguments the function can accept
+ **/
+
+add_action('epfl_toggle_action', 'renderToggle', 10, 1);
+
+function renderToggle ($args) {
+
+  if (is_admin()) {
+
+    // render placeholder for backend editor
+    set_query_var('epfl_placeholder_title', 'Toggle');
+    get_template_part('shortcodes/placeholder');
+
+  } else {
+
+    $fields = array();
+    foreach ($args as $key => $value) {
+      $toggle_key = substr($key, -1);
+      $field_name = substr($key, 0, -1);  
+      $fields[$toggle_key][$field_name] = $value;
+    }
+    set_query_var('epfl_toggle_data', $fields);
+    get_template_part('shortcodes/epfl_toggle/view');
+  }
+}
diff --git a/shortcodes/epfl_toggle/view.php b/shortcodes/epfl_toggle/view.php
new file mode 100644
index 00000000..806960f4
--- /dev/null
+++ b/shortcodes/epfl_toggle/view.php
@@ -0,0 +1,25 @@
+<?php  
+  $data = get_query_var('epfl_toggle_data');
+  
+  foreach ($data as $key => $value) : 
+    if (strlen($value['desc']) === 0 and strlen($value['label']) === 0) {  
+      continue;
+    }
+?>
+  <button
+      class="collapse-title collapse-title-desktop collapsed"
+      type="button"
+      data-toggle="collapse"
+      data-target="<?php echo '#collapse-' . $key ?>"
+      aria-expanded="false"
+      aria-controls="<?php echo '#collapse-' . $key ?>"
+    >
+    <?php echo $value['label']; ?>
+  </button>
+  <div 
+    class="collapse collapse-item collapse-item-desktop <?php if ($value['state'] === 'open'): ?> show <?php endif; ?> " 
+    id="<?php echo 'collapse' . '-' . $key ?>"
+  >
+    <p><?php echo urldecode($value['desc']); ?></p>
+  </div>
+<?php endforeach; ?>
diff --git a/shortcodes/epfl_video/controller.php b/shortcodes/epfl_video/controller.php
new file mode 100755
index 00000000..17b8d95f
--- /dev/null
+++ b/shortcodes/epfl_video/controller.php
@@ -0,0 +1,25 @@
+<?php
+
+/** 
+ * 3rd argument is the priority, higher means executed first
+ * 4rth argument is number of arguments the function can accept
+ **/
+
+add_action('epfl_video_action', 'renderVideo', 10, 3);
+
+function renderVideo ($url, $width, $height) {
+
+  if (is_admin()) {
+
+    // render placeholder for backend editor
+    set_query_var('epfl_placeholder_title', 'Video');
+    get_template_part('shortcodes/placeholder');
+
+  } else {
+    
+    set_query_var('epfl_video_url', $url);
+    set_query_var('epfl_video_width', $width);
+    set_query_var('epfl_video_height', $height);
+    get_template_part('shortcodes/epfl_video/view');
+  }
+}
diff --git a/shortcodes/epfl_video/view.php b/shortcodes/epfl_video/view.php
new file mode 100755
index 00000000..52c9af9c
--- /dev/null
+++ b/shortcodes/epfl_video/view.php
@@ -0,0 +1,11 @@
+<?php
+  $url    = get_query_var('epfl_video_url');
+  $width  = get_query_var('epfl_video_width');
+  $height = get_query_var('epfl_video_height');
+?>
+
+<div class="container">
+  <div class="embed-responsive embed-responsive-16by9">
+    <iframe src="<?php echo $url ?>" width="<?php echo $width ?>" height="<?php echo $height ?>" webkitallowfullscreen mozallowfullscreen allowfullscreen allow="autoplay; encrypted-media" frameborder="0" class="embed-responsive-item"></iframe>
+  </div>
+</div>
diff --git a/shortcodes/index.php b/shortcodes/index.php
index d02dcd5e..80ffa4d1 100644
--- a/shortcodes/index.php
+++ b/shortcodes/index.php
@@ -5,13 +5,17 @@
 require_once(get_template_directory().'/shortcodes/definition_list/controller.php');
 require_once(get_template_directory().'/shortcodes/introduction/controller.php');
 require_once(get_template_directory().'/shortcodes/hero/controller.php');
-require_once(get_template_directory().'/shortcodes/collapsable/controller.php');
-require_once(get_template_directory().'/shortcodes/epfl_news/controller.php');
-require_once(get_template_directory().'/shortcodes/epfl_memento/controller.php');
 require_once(get_template_directory().'/shortcodes/page_teaser/controller.php');
-require_once(get_template_directory().'/shortcodes/epfl_scienceqa/controller.php');
 require_once(get_template_directory().'/shortcodes/post_teaser/controller.php');
 require_once(get_template_directory().'/shortcodes/custom_teasers/controller.php');
 require_once(get_template_directory().'/shortcodes/page_highlight/controller.php');
 require_once(get_template_directory().'/shortcodes/post_highlight/controller.php');
 require_once(get_template_directory().'/shortcodes/custom_highlight/controller.php');
+require_once(get_template_directory().'/shortcodes/epfl_news/controller.php');
+require_once(get_template_directory().'/shortcodes/epfl_memento/controller.php');
+require_once(get_template_directory().'/shortcodes/epfl_toggle/controller.php');
+require_once(get_template_directory().'/shortcodes/epfl_scienceqa/controller.php');
+require_once(get_template_directory().'/shortcodes/epfl_cover/controller.php');
+require_once(get_template_directory().'/shortcodes/epfl_card/controller.php');
+require_once(get_template_directory().'/shortcodes/epfl_links_group/controller.php');
+require_once(get_template_directory().'/shortcodes/epfl_video/controller.php');
\ No newline at end of file
diff --git a/sidebar.php b/sidebar.php
index 9ba760fc..ecd627bc 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -9,6 +9,8 @@
 
 global $wp_query;
 
+global $EPFL_MENU_LOCATION;
+
 // recover current post and menu item
 $items = wp_get_nav_menu_items(get_current_menu_slug());
 $item = reset(wp_filter_object_list( $items, ['object_id' => $post->ID]));
@@ -23,7 +25,7 @@
 		<div class="nav-container <?php echo $classes ?>">
 			<?php
 				wp_nav_menu( array(
-					'theme_location' => 'primary',
+					'theme_location' => $EPFL_MENU_LOCATION,
 					'menu_class'=> 'nav-menu',
 					'container' => 'ul',
 					'walker' => new Custom_Nav_Walker()
@@ -49,7 +51,8 @@
   	<h2 class="h5 sr-only-xl"><?php esc_html_e("In the same section", 'epfl') ?></h2>
 				<?php
 				wp_nav_menu( array(
-					'menu_class'=> 'nav-menu',
+				    'theme_location' => $EPFL_MENU_LOCATION,
+        		    'menu_class'=> 'nav-menu',
 					'container' => 'ul',
 					'submenu' => get_the_ID(),
 					'submenu_type' => $asideContent
diff --git a/style.css b/style.css
index 2e5dcac1..fc8cfe27 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI:
 Author: Antistatique.net
 Author URI: http://antistatique.net/
 Description: Description
-Version: 1.2.4
+Version: 1.2.5
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: epfl
diff --git a/template-parts/breadcrumb.php b/template-parts/breadcrumb.php
index 08bbe272..60135c71 100644
--- a/template-parts/breadcrumb.php
+++ b/template-parts/breadcrumb.php
@@ -31,9 +31,9 @@
   <?php
     // Breadcrumb
     $items = wp_get_nav_menu_items(get_current_menu_slug());
-    $item = reset(wp_filter_object_list( $items, ['object_id' => $post->ID]));
 
-    _wp_menu_item_classes_by_context( $items ); // Set up the class variables, including current-classes
+    $item = $items ? reset(wp_filter_object_list( $items, ['object_id' => $post->ID])) : false;
+
     $crumbs = array();
 
     echo '<nav aria-label="breadcrumb" class="breadcrumb-wrapper" id="breadcrumb-wrapper"><ul class="p-0 m-0">';
@@ -44,20 +44,23 @@
             </a>
         </li>';
 
-    foreach($items as $item) {
-        if ($item->current_item_ancestor) {
+    if ($items) {
+      _wp_menu_item_classes_by_context( $items ); // Set up the class variables, including current-classes
+      foreach($items as $item) {
+          if ($item->current_item_ancestor) {
+              $crumbs[] = "
+                  <li class=\"breadcrumb-item\">
+                      <a class=\"bread-link bread-home\" href=\"{$item->url}\" title=\"{$item->title}\">
+                          {$item->title}
+                      </a>
+                  </li>";
+          } else if ($item->current) {
             $crumbs[] = "
-                <li class=\"breadcrumb-item\">
-                    <a class=\"bread-link bread-home\" href=\"{$item->url}\" title=\"{$item->title}\">
-                        {$item->title}
-                    </a>
-                </li>";
-        } else if ($item->current) {
-          $crumbs[] = "
-                <li class=\"breadcrumb-item active\">
-                    {$item->title}
-                </li>";
-        }
+                  <li class=\"breadcrumb-item active\">
+                      {$item->title}
+                  </li>";
+          }
+      }
     }
     echo implode('', $crumbs);
     echo '</ul></nav>';