diff --git a/_inventory.html b/_inventory.html
index 752e5f1..53e9566 100644
--- a/_inventory.html
+++ b/_inventory.html
@@ -7,20 +7,17 @@
 {{* filtrer selon la catégorie *}}
 {{if $_GET.cat_key == null}}
 	{{:assign selected_category=$module.config.stock_cat_key}}
-	{{if $module.config.stock_cat_key != null}}
-		{{:assign cat_key=$selected_category|quote_sql}}
-	{{/if}}
 {{elseif $_GET.cat_key == -1}}
 	{{:assign selected_category=null}}
 	{{:save key="config" stock_cat_key=null}}
 {{else}}
 	{{:assign selected_category=$_GET.cat_key}}
-	{{:assign cat_key=$selected_category|quote_sql}}
 	{{:save key="config" stock_cat_key=$selected_category}}
 {{/if}}
 
 {{* condition de filtrage *}}
 {{if $selected_category != null}}
+	{{:assign cat_key=$selected_category|quote_sql}}
 	{{:assign cat_condition="$$.category = %s"|args:$cat_key}}
 {{else}}
 	{{:assign cat_condition="1"}}
diff --git a/_nav.html b/_nav.html
index 5c81e1a..25db82c 100644
--- a/_nav.html
+++ b/_nav.html
@@ -13,25 +13,22 @@
 
 	<ul>
 		<li {{if $current == 'inventaire'}} class="current"{{/if}}><a href="{{$module.url}}index.html">Inventaire</a></li>
+		<li {{if $current == 'historique'}} class="current"{{/if}}><a href="{{$module.url}}global_history.html">Historique</a></li>
+		<li {{if $current == 'prêts'}} class="current"{{/if}}><a href="{{$module.url}}loan_history.html">Prêts</a></li>
 		<li {{if $current == 'archives'}} class="current"{{/if}}><a href="{{$module.url}}archives.html">Archives</a></li>
 		<li {{if $current == 'config'}} class="current"{{/if}}><a href="{{$module.url}}categories/index.html">Configuration</a></li>
 	</ul>
 
 	{{if $current == 'inventaire'}}
-		<ul class="sub">
-			<li {{if $subcurrent == 'stock'}} class="current"{{/if}}><a href="{{$module.url}}index.html">Stock</a></li>
-			<li {{if $subcurrent == 'historique'}} class="current"{{/if}}><a href="{{$module.url}}global_history.html">Historique</a></li>
-		</ul>
-
-		{{if $subsubcurrent == 'historique'}}
+		{{if $subcurrent == 'historique'}}
 			<ul class="sub">
 				<li class="title"><strong>Historique — {{$eqpmt}} ({{$category}})</strong></li>
 			</ul>
 		{{/if}}
-	{{elseif $current == 'historique'}}
+	{{elseif $current == 'prêts'}}
 		<ul class="sub">
-			<li {{if $subcurrent == 'tous'}} class="current"{{/if}}><a href="{{$module.url}}global_history.html">Tous</a></li>
-			<li {{if $subcurrent == 'prêts'}} class="current"{{/if}}><a href="{{$module.url}}loan_history.html">Prêts</a></li>
+			<li {{if $subcurrent == 'encours'}} class="current"{{/if}}><a href="{{$module.url}}loan_history.html">En cours</a></li>
+			<li {{if $subcurrent == 'historique'}} class="current"{{/if}}><a href="{{$module.url}}loan_movements.html">Historique</a></li>
 		</ul>
 	{{elseif $current == 'archives'}}
 		{{if $subsubcurrent == 'historique'}}
diff --git a/equipment_history.html b/equipment_history.html
index 36283b9..e39d1e4 100644
--- a/equipment_history.html
+++ b/equipment_history.html
@@ -31,7 +31,7 @@
 {{else}}
 	{{:assign current="inventaire"}}
 {{/if}}
-{{:include file="./_nav.html" current=$current subcurrent="stock" subsubcurrent="historique" eqpmt=$equipment.name category=$category.name}}
+{{:include file="./_nav.html" current=$current subcurrent="historique" eqpmt=$equipment.name category=$category.name}}
 
 {{if $_GET.ok}}
 	{{if $_GET.msg == "modification"}}
diff --git a/global_history.html b/global_history.html
index b741958..a3210ea 100644
--- a/global_history.html
+++ b/global_history.html
@@ -8,7 +8,7 @@
 
 {{:admin_header title="Historique des mouvements" custom_css="./style.css" current="module_equipment"}}
 
-{{:include file="./_nav.html" current="inventaire" subcurrent="historique"}}
+{{:include file="./_nav.html" current="historique"}}
 
 {{* récupérer la config des entrées/sorties *}}
 {{:include file="./_get_config.html" keep="config"}}
diff --git a/loan_history.html b/loan_history.html
index 997ffa4..0442354 100644
--- a/loan_history.html
+++ b/loan_history.html
@@ -3,7 +3,7 @@
 {{#restrict block=true section="accounting" level="write"}}{{/restrict}}
 
 {{:admin_header title="Matériels hors de l'asso" custom_css="../style.css" current="module_equipment"}}
-{{:include file="./_nav.html" current="historique" subcurrent="prêts"}}
+{{:include file="./_nav.html" current="prêts" subcurrent="encours"}}
 
 {{*
 	vérifier l'existence de la table du module
@@ -32,7 +32,7 @@
 {{/if}}
 
 <div class="shortFormLeft">
-	<p class="help">Historique des prêts de matériel</p>
+	<p class="help">Prêts de matériel en cours</p>
 </div>
 
 {{* lecture config (défaut ou enregistrée) *}}