diff --git a/gallery/templates/album.j2 b/gallery/templates/album.j2
index b2f7423..32735ac 100644
--- a/gallery/templates/album.j2
+++ b/gallery/templates/album.j2
@@ -12,15 +12,20 @@
 
 <div class="nav">
 	<ul>
-		<li><a href="/">Home</a> /</li>
-		<li><a href="/">{{ album }}</a></li>
+		<li><a href="{{ url_for('default_routes.index') }}">Home</a></li>
+		<li>/</li>
+		<li>
+			<a href="{{ url_for('default_routes.album', path=album) }}">
+				{{ album }}
+			</a>
+		</li>
 	</ul>
 </div>
 
 <div class="flex_container">
 	{% for image in images %}
 	<div class="infocard">
-		<a href="{{ img_root + image }}">
+		<a href="{{ url_for('default_routes.image', path=album, img=image) }}">
 			<img src="{{ url_for(
 				'default_routes.thumbs',
 				path=album,
diff --git a/gallery/templates/index.j2 b/gallery/templates/index.j2
index dd3e076..f31b7de 100644
--- a/gallery/templates/index.j2
+++ b/gallery/templates/index.j2
@@ -12,7 +12,7 @@
 
 <div class="nav">
 	<ul>
-		<li><a href="/">Home</a></li>
+		<li><a href="{{ url_for('default_routes.index') }}">Home</a></li>
 	</ul>
 </div>
 
@@ -20,7 +20,7 @@
 <div class="flex_container">
 	{% for album in albums %}
 	<div class="infocard">
-		<a href="/album/{{ album.name|urlencode }}">
+		<a href="{{ url_for('default_routes.album', path=album.name) }}">
 			{% if album.count > 0 %}
 			<img src="{{ url_for(
 				'default_routes.thumbs',
diff --git a/gallery/views/default_routes.py b/gallery/views/default_routes.py
index d5ea522..a685c8b 100644
--- a/gallery/views/default_routes.py
+++ b/gallery/views/default_routes.py
@@ -42,7 +42,6 @@ def album(path:str = '') -> Response:
             images.append(entry.name)
 
     return render_template('album.j2',
-        img_root = f'/image/{path}/',
         album = path,
         images = sorted(images)
     )