diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html
index 04600e586..d3b1c3c9a 100644
--- a/src/main/resources/templates/home.html
+++ b/src/main/resources/templates/home.html
@@ -27,7 +27,7 @@
 					<div class="card-body">
 						<h5 class="card-title">Merge PDFs</h5>
 						<p class="card-text">Easily merge multiple PDFs into one.</p>
-						<a href="#" class="btn btn-primary" th:href="@{/merge-pdfs}">Go</a>
+						<a href="#" class="btn btn-primary" th:href="@{merge-pdfs}">Go</a>
 					</div>
 				</div>
 			</div>
@@ -36,7 +36,7 @@
 					<div class="card-body">
 						<h5 class="card-title">Split PDFs</h5>
 						<p class="card-text">Split PDFs into multiple documents</p>
-						<a href="#" class="btn btn-primary" th:href="@{/split-pdfs}">Go</a>
+						<a href="#" class="btn btn-primary" th:href="@{split-pdfs}">Go</a>
 					</div>
 				</div>
 			</div>
@@ -45,7 +45,7 @@
 					<div class="card-body">
 						<h5 class="card-title">Add image to PDF</h5>
 						<p class="card-text">Adds image/watermark to a PDF</p>
-						<a href="#" class="btn btn-primary" th:href="@{/add-image}">Go</a>
+						<a href="#" class="btn btn-primary" th:href="@{add-image}">Go</a>
 					</div>
 				</div>
 			</div>
@@ -57,7 +57,7 @@
 					<div class="card-body">
 						<h5 class="card-title">Convert to/from PDF</h5>
 						<p class="card-text">Convert images to/from PDF.</p>
-						<a href="#" class="btn btn-primary" th:href="@{/convert-pdf}">Go</a>
+						<a href="#" class="btn btn-primary" th:href="@{convert-pdf}">Go</a>
 					</div>
 				</div>
 			</div>
@@ -67,7 +67,7 @@
 					<div class="card-body">
 						<h5 class="card-title">PDF Organizer</h5>
 						<p class="card-text">Remove/Rearrange pages in any order</p>
-						<a href="#" class="btn btn-primary" th:href="@{/pdf-organizer}">Go</a>
+						<a href="#" class="btn btn-primary" th:href="@{pdf-organizer}">Go</a>
 					</div>
 				</div>
 			</div>
@@ -77,7 +77,7 @@
 					<div class="card-body">
 						<h5 class="card-title">Rotate PDFs</h5>
 						<p class="card-text">Easily rotate your PDFs.</p>
-						<a href="#" class="btn btn-primary" th:href="@{/rotate-pdf}">Go</a>
+						<a href="#" class="btn btn-primary" th:href="@{rotate-pdf}">Go</a>
 					</div>
 				</div>
 			</div>
@@ -95,7 +95,7 @@
 					<div class="card-body">
 						<h5 class="card-title">Compress PDFs</h5>
 						<p class="card-text">Compress PDFs to reduce their file size.</p>
-						<a href="#" class="btn btn-primary" th:href="@{/compress-pdf}">Go</a>
+						<a href="#" class="btn btn-primary" th:href="@{compress-pdf}">Go</a>
 					</div>
 				</div>
 			</div>
diff --git a/src/main/resources/templates/navbar.html b/src/main/resources/templates/navbar.html
index 0b80f9c95..0c7297f37 100644
--- a/src/main/resources/templates/navbar.html
+++ b/src/main/resources/templates/navbar.html
@@ -1,7 +1,7 @@
 <div th:fragment="navbar">
 	<nav class="navbar navbar-expand-lg navbar-light bg-light">
 		<div class="container">
-			<a class="navbar-brand" href="#" th:href="@{/home}">Stirling PDF</a>
+			<a class="navbar-brand" href="#" th:href="@{home}">Stirling PDF</a>
 			<button class="navbar-toggler" type="button" data-toggle="collapse"
 				data-target="#navbarNav" aria-controls="navbarNav"
 				aria-expanded="false" aria-label="Toggle navigation">
@@ -11,30 +11,30 @@
 				<ul class="navbar-nav">
 
 					<li class="nav-item"><a class="nav-link" href="#"
-						th:href="@{/merge-pdfs}"
+						th:href="@{merge-pdfs}"
 						th:classappend="${currentPage}=='merge-pdfs' ? 'active' : ''">Merge
 							PDFs</a></li>
 					<li class="nav-item"><a class="nav-link" href="#"
-						th:href="@{/split-pdfs}"
+						th:href="@{split-pdfs}"
 						th:classappend="${currentPage}=='split-pdfs' ? 'active' : ''">Split
 							PDFs</a></li>
 					<li class="nav-item"><a class="nav-link" href="#"
-						th:href="@{/convert-pdf}"
+						th:href="@{convert-pdf}"
 						th:classappend="${currentPage}=='convert-pdf' ? 'active' : ''">Convert
 							to/from PDF</a></li>
 					<li class="nav-item"><a class="nav-link" href="#"
-						th:href="@{/add-image}"
+						th:href="@{add-image}"
 						th:classappend="${currentPage}=='add-image' ? 'active' : ''">Add
 							image to PDF</a></li>
 					<li class="nav-item"><a class="nav-link" href="#"
-						th:href="@{/pdf-organizer}"
+						th:href="@{pdf-organizer}"
 						th:classappend="${currentPage}=='pdf-organizer' ? 'active' : ''">PDF
 							Organizer</a></li>
 					<li class="nav-item"><a class="nav-link" href="#"
-						th:href="@{/rotate-pdf}"
+						th:href="@{rotate-pdf}"
 						th:classappend="${currentPage}=='rotate-pdf' ? 'active' : ''">Rotate PDF</a></li>
 					<li class="nav-item"><a class="nav-link" href="#"
-						th:href="@{/compress-pdf}"
+						th:href="@{compress-pdf}"
 						th:classappend="${currentPage}=='compress-pdf' ? 'active' : ''">Compress PDF</a></li>	
 												
 					<input type="checkbox" id="toggle-dark-mode"