diff --git a/dashboard/static/index.html b/dashboard/static/index.html
index 53149f0f..99afa26f 100644
--- a/dashboard/static/index.html
+++ b/dashboard/static/index.html
@@ -365,7 +365,7 @@
 		<div class="carousel slide" data-interval="12000" style="padding-bottom: 0px" autocarousel>
 		  <div class="carousel-inner">
 		    <div class="carousel-item" ng-repeat="theme in themes" ng-class="{active: $first}">
-		      <div class="carousel-caption text-indent">
+		      <div class="carousel-caption text-indent" ng-if="theme.urlid !== '_'">
 			<div class="card-img-top theme-card" style="background-image: url('{{ theme.image.substr(0, theme.image.length-3) }}thumb.jpg')"></div>
 			<h3 class="text-left" ng-bind="theme.name"></h3>
 			<p class="text-justify" style="font-size: 111%" ng-bind-html="theme.headline"></p>
@@ -377,7 +377,8 @@
 	    </div>
 
 	    <div class="card niceborder bg-dark" ng-if="s.type == 'exercice' && !s.params.hide">
-	      <div class="card-img-top theme-card" style="background-image: url('{{themes[my.exercices[s.params.exercice].theme_id].image}}')"></div>
+	      <div class="card-img-top theme-card" style="background-image: url('{{exercices[s.params.exercice].image}}')" ng-if="exercices[s.params.exercice] && exercices[s.params.exercice].image"></div>
+	      <div class="card-img-top theme-card" style="background-image: url('{{themes[my.exercices[s.params.exercice].theme_id].image}}')" ng-if="!exercices[s.params.exercice] || !exercices[s.params.exercice].image"></div>
 	      <div class="card-body text-light">
 		<h3 style="font-size: 1.0rem; text-weight: bold; overflow: hidden; text-overflow: ellipsis; white-space: nowrap">Défi <em>{{ exercices[s.params.exercice].title }}</em> du thème <em>{{ themes[my.exercices[s.params.exercice].theme_id].name }}</em></h3>
 		<p ng-bind-html="my.exercices[s.params.exercice].overview"></p>
@@ -397,7 +398,8 @@
 		  Challenges à la une
 		</span>
 	      </div>
-	      <div class="card-img-top theme-card" style="background-image: url('{{themes[my.exercices[lastExercice].theme_id].image}}')"></div>
+	      <div class="card-img-top theme-card" style="background-image: url('{{exercices[lastExercice].image}}')" ng-if="exercices[lastExercice] && exercices[lastExercice].image"></div>
+	      <div class="card-img-top theme-card" style="background-image: url('{{themes[my.exercices[lastExercice].theme_id].image}}')" ng-if="!exercices[s.params.exercice] || !exercices[s.params.exercice].image"></div>
 	      <div class="card-body text-light">
 		<h3 style="font-size: 1.0rem; text-weight: bold; overflow: hidden; text-overflow: ellipsis; white-space: nowrap"><em>{{ exercices[lastExercice].title }}</em> du thème <em>{{ themes[my.exercices[lastExercice].theme_id].name }}</em></h3>
 		<p ng-bind-html="my.exercices[lastExercice].overview"></p>