diff --git a/src/main/resources/templates/add-image.html b/src/main/resources/templates/add-image.html
index 80a2f64d4..f0c81be0a 100644
--- a/src/main/resources/templates/add-image.html
+++ b/src/main/resources/templates/add-image.html
@@ -17,7 +17,7 @@
 
 
 
-				<form method="post" th:action="@{/add-image}"
+				<form method="post" th:action="@{add-image}"
 					enctype="multipart/form-data">
 
 					<div class="custom-file">
diff --git a/src/main/resources/templates/compress-pdf.html b/src/main/resources/templates/compress-pdf.html
index da519f2f4..fdf47a26d 100644
--- a/src/main/resources/templates/compress-pdf.html
+++ b/src/main/resources/templates/compress-pdf.html
@@ -17,7 +17,7 @@
 
 
 				
-				<form action="#" th:action="@{/compress-pdf}" th:object="${rotateForm}"
+				<form action="#" th:action="@{compress-pdf}" th:object="${rotateForm}"
 					method="post" enctype="multipart/form-data">
 					<p>Warning: This process can take up to a minute depending on file-size</p>
 					<div class="custom-file">
diff --git a/src/main/resources/templates/convert-pdf.html b/src/main/resources/templates/convert-pdf.html
index 798cdb2c3..caa89d055 100644
--- a/src/main/resources/templates/convert-pdf.html
+++ b/src/main/resources/templates/convert-pdf.html
@@ -15,7 +15,7 @@
 				<h2>Image to PDF</h2>
 
 				<form method="post" enctype="multipart/form-data"
-					th:action="@{/convert-to-pdf}">
+					th:action="@{convert-to-pdf}">
 					<div class="custom-file">
 						<input type="file" class="custom-file-input" id="fileInput"
 							name="fileInput" required> <label
@@ -35,7 +35,7 @@
 			<div class="col-md-6">
 				<h2>PDF to img</h2>
 				<form method="post" enctype="multipart/form-data"
-					th:action="@{/convert-from-pdf}">
+					th:action="@{convert-from-pdf}">
 					<div class="custom-file">
 						<input type="file" class="custom-file-input" id="fileInput"
 							name="fileInput" required> <label
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/merge-pdfs.html b/src/main/resources/templates/merge-pdfs.html
index 67ed1276a..b0a027d63 100644
--- a/src/main/resources/templates/merge-pdfs.html
+++ b/src/main/resources/templates/merge-pdfs.html
@@ -15,7 +15,7 @@
 		<div class="row justify-content-center">
 			<div class="col-md-6" >
 				<h2>Merge multiple PDFs (2+)</h2>
-				<form action="/merge-pdfs" method="post"
+				<form action="merge-pdfs" method="post"
 					enctype="multipart/form-data">
 					<div class="form-group">
 						<label>Select (or drag & drop) all PDFs to merge</label>
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"
diff --git a/src/main/resources/templates/pdf-organizer.html b/src/main/resources/templates/pdf-organizer.html
index 9bd9b9d72..9e8e578f3 100644
--- a/src/main/resources/templates/pdf-organizer.html
+++ b/src/main/resources/templates/pdf-organizer.html
@@ -16,7 +16,7 @@
 
 
 
-				<form th:action="@{/rearrange-pages}" method="post"
+				<form th:action="@{rearrange-pages}" method="post"
 					enctype="multipart/form-data">
 					<div class="custom-file">
 						<input type="file" class="custom-file-input" id="fileInput"
diff --git a/src/main/resources/templates/rotate-pdf.html b/src/main/resources/templates/rotate-pdf.html
index ceb23f747..2eb00bd17 100644
--- a/src/main/resources/templates/rotate-pdf.html
+++ b/src/main/resources/templates/rotate-pdf.html
@@ -17,7 +17,7 @@
 
 
 
-				<form action="#" th:action="@{/rotate-pdf}" th:object="${rotateForm}"
+				<form action="#" th:action="@{rotate-pdf}" th:object="${rotateForm}"
 					method="post" enctype="multipart/form-data">
 					<div class="custom-file">
 						<input type="file" class="custom-file-input" id="fileInput"
diff --git a/src/main/resources/templates/split-pdfs.html b/src/main/resources/templates/split-pdfs.html
index 768b33328..ce4fbb5d9 100644
--- a/src/main/resources/templates/split-pdfs.html
+++ b/src/main/resources/templates/split-pdfs.html
@@ -24,7 +24,7 @@
 				<p>Document #5: Page 8</p>
 				<p>Document #6: Page 9 and 10</p>
 
-				<form th:action="@{/split-pages}" method="post"
+				<form th:action="@{split-pages}" method="post"
 					enctype="multipart/form-data">
 					<div class="custom-file">
 						<input type="file" class="custom-file-input" id="fileInput"